CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'watchface-casio-digital-G7710' of github.com:ITCactus/InfiniTime into ITCactus-watchface-casio-digital-G7710

Browse Source 
# Conflicts:
#	src/components/settings/Settings.h
#	src/displayapp/screens/CheckboxList.cpp
#	src/displayapp/screens/CheckboxList.h
#	src/displayapp/screens/Clock.cpp
#	src/displayapp/screens/Clock.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
This commit is contained in:
Jean-François Milants
2022-09-27 21:59:22 +02:00
parent 63932810d2 50b98798b9
commit fbe964ff44
7 changed files with 456 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/settings/Settings.h
View File

@@ -123,6 +123,14 @@ namespace Pinetime {
appMenu = menu;
};
void SetWatchfacesMenu(uint8_t menu) {
watchFacesMenu = menu;
};
uint8_t GetWatchfacesMenu() const {
return watchFacesMenu;
};
uint8_t GetAppMenu() const {
return appMenu;
};
@@ -134,14 +142,6 @@ namespace Pinetime {
return settingsMenu;
};
void SetWatchfacesMenu(uint8_t menu) {
watchFacesMenu = menu;
};
uint8_t GetWatchfacesMenu() const {
return watchFacesMenu;
};
void SetClockType(ClockType clocktype) {
if (clocktype != settings.clockType) {
settingsChanged = true;