scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Cleanup

Browse source
This commit is contained in:
Kieran Cawthray 2022-09-06 12:38:25 +02:00
parent fbc9f63308
commit 4fe834efda
2 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/settings/Settings.h
View file

@ -237,7 +237,6 @@ namespace Pinetime {
ChimesOption chimesOption = ChimesOption::None; ChimesOption chimesOption = ChimesOption::None;
PineTimeStyle PTS; PineTimeStyle PTS;
//PineTimeStyle::GaugeStyle gaugeStyle = PineTimeStyle::GaugeStyle::Full;
std::bitset<4> wakeUpMode {0}; std::bitset<4> wakeUpMode {0};
uint16_t shakeWakeThreshold = 150; uint16_t shakeWakeThreshold = 150;

48
src/displayapp/screens/WatchFacePineTimeStyle.cpp
View file

@ -626,32 +626,32 @@ void WatchFacePineTimeStyle::UpdateSelected(lv_obj_t* object, lv_event_t event)
} }
if (object == btnSteps) { if (object == btnSteps) {
if (!lv_obj_get_hidden(stepGauge) && (lv_obj_get_hidden(timeDD3))) { if (!lv_obj_get_hidden(stepGauge) && (lv_obj_get_hidden(timeDD3))) {
// show half gauge & seconds // show half gauge & seconds
lv_obj_set_hidden(timeDD3, false); lv_obj_set_hidden(timeDD3, false);
lv_obj_set_size(stepGauge, 37, 37); lv_obj_set_size(stepGauge, 37, 37);
lv_obj_align(stepGauge, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, -10); lv_obj_align(stepGauge, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, -10);
lv_gauge_set_scale(stepGauge, 180, 5, 0); lv_gauge_set_scale(stepGauge, 180, 5, 0);
lv_gauge_set_angle_offset(stepGauge, 0); lv_gauge_set_angle_offset(stepGauge, 0);
lv_gauge_set_critical_value(stepGauge, 120); lv_gauge_set_critical_value(stepGauge, 120);
settingsController.SetPTSGaugeStyle(Controllers::Settings::PTSGaugeStyle::Half); settingsController.SetPTSGaugeStyle(Controllers::Settings::PTSGaugeStyle::Half);
} else if (!lv_obj_get_hidden(timeDD3) && (lv_obj_get_hidden(stepValue))) { } else if (!lv_obj_get_hidden(timeDD3) && (lv_obj_get_hidden(stepValue))) {
// show step count & icon // show step count & icon
lv_obj_set_hidden(timeDD3, true); lv_obj_set_hidden(timeDD3, true);
lv_obj_set_hidden(stepGauge, true); lv_obj_set_hidden(stepGauge, true);
lv_obj_set_hidden(stepValue, false); lv_obj_set_hidden(stepValue, false);
lv_obj_set_hidden(stepIcon, false); lv_obj_set_hidden(stepIcon, false);
settingsController.SetPTSGaugeStyle(Controllers::Settings::PTSGaugeStyle::Numeric); settingsController.SetPTSGaugeStyle(Controllers::Settings::PTSGaugeStyle::Numeric);
} else { } else {
// show full gauge // show full gauge
lv_obj_set_hidden(stepGauge, false); lv_obj_set_hidden(stepGauge, false);
lv_obj_set_hidden(stepValue, true); lv_obj_set_hidden(stepValue, true);
lv_obj_set_hidden(stepIcon, true); lv_obj_set_hidden(stepIcon, true);
lv_obj_set_size(stepGauge, 40, 40); lv_obj_set_size(stepGauge, 40, 40);
lv_obj_align(stepGauge, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, 0); lv_obj_align(stepGauge, sidebar, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
lv_gauge_set_scale(stepGauge, 360, 11, 0); lv_gauge_set_scale(stepGauge, 360, 11, 0);
lv_gauge_set_angle_offset(stepGauge, 180); lv_gauge_set_angle_offset(stepGauge, 180);
lv_gauge_set_critical_value(stepGauge, 100); lv_gauge_set_critical_value(stepGauge, 100);
settingsController.SetPTSGaugeStyle(Controllers::Settings::PTSGaugeStyle::Full); settingsController.SetPTSGaugeStyle(Controllers::Settings::PTSGaugeStyle::Full);
} }
} }
if (object == btnSetColor) { if (object == btnSetColor) {