diff options
author | Kieran Cawthray <kieranc@gmail.com> | 2021-11-15 19:38:29 +0100 |
---|---|---|
committer | Kieran Cawthray <kieranc@gmail.com> | 2021-11-15 19:38:29 +0100 |
commit | 5a0cf8e3485dee193a86e8929233ecddb6711a94 (patch) | |
tree | 670c51ab64c465e4b198751fea800685066d7a1b /src/displayapp/screens | |
parent | 2fa63c7f37f2441b7e126b83ed0da1896ca25fe9 (diff) | |
parent | a57fda6ba4a29866083a1254ffdf92939d00e182 (diff) |
Merge remote-tracking branch 'upstream/develop' into pts-settings
Diffstat (limited to 'src/displayapp/screens')
-rw-r--r-- | src/displayapp/screens/Alarm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h index 32a14d2f..487ba1d5 100644 --- a/src/displayapp/screens/Alarm.h +++ b/src/displayapp/screens/Alarm.h @@ -40,7 +40,9 @@ namespace Pinetime { Controllers::AlarmController& alarmController; lv_obj_t *time, *btnEnable, *txtEnable, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp, *txtMinDown, - *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnMessage, *txtMessage, *btnInfo, *txtInfo; + *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnInfo, *txtInfo; + lv_obj_t* txtMessage = nullptr; + lv_obj_t* btnMessage = nullptr; enum class EnableButtonState { On, Off, Alerting }; void SetEnableButtonState(); |