mirror
/
ClassiCube
mirror of https://github.com/ClassiCube/ClassiCube
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move auto close option to launcher 

Doesn't really make sense to set this option from in-game
This commit is contained in:
UnknownShadow200 2021-12-20 09:26:40 +11:00
parent 5854e76ef5
commit 41c9e47d27
2 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitignore vendored
View File

@ -32,16 +32,16 @@ bld/
[Oo]bj/ [Oo]bj/
[Oo]utput/ [Oo]utput/
[Pp]rofilingSessions/ [Pp]rofilingSessions/
[sS]rc/audio src/audio
[sS]rc/texpacks src/texpacks
[sS]rc/maps src/maps
[sS]rc/texturecache src/texturecache
[sS]rc/logs src/logs
[sS]rc/options.txt src/options.txt
[sS]rc/ClassiCube* src/ClassiCube*
[sS]rc/screenshots src/screenshots
[sS]rc/fontscache.txt src/fontscache.txt
[sSrc]/.vs/ src/.vs/
#GCC object files #GCC object files
*.o *.o

40
src/LScreens.c
View File

@ -1412,13 +1412,10 @@ static struct SettingsScreen {
LScreen_Layout LScreen_Layout
struct LButton btnUpdates, btnMode, btnColours, btnBack; struct LButton btnUpdates, btnMode, btnColours, btnBack;
struct LLabel lblUpdates, lblMode, lblColours; struct LLabel lblUpdates, lblMode, lblColours;
#if defined CC_BUILD_MOBILE struct LLabel lblExtra;
struct LLabel lblOrientlock; struct LCheckbox cbExtra;
struct LCheckbox cbOrientlock; struct LLine sep;
struct LWidget* _widgets[9]; struct LWidget* _widgets[10];
#else
struct LWidget* _widgets[7];
#endif
} SettingsScreen_Instance; } SettingsScreen_Instance;
#if defined CC_BUILD_MOBILE #if defined CC_BUILD_MOBILE
@ -1429,11 +1426,19 @@ static void SettingsScreen_LockOrientation(void* w, int idx) {
Window_LockLandscapeOrientation(cb->value); Window_LockLandscapeOrientation(cb->value);
Launcher_Redraw(); Launcher_Redraw();
} }
#else
static void SettingsScreen_AutoClose(void* w, int idx) {
struct LCheckbox* cb = (struct LCheckbox*)w;
cb->value = !cb->value;
Options_SetBool(OPT_AUTO_CLOSE_LAUNCHER, cb->value);
Launcher_Redraw();
}
#endif #endif
static void SettingsScreen_Init(struct LScreen* s_) { static void SettingsScreen_Init(struct LScreen* s_) {
struct SettingsScreen* s = (struct SettingsScreen*)s_; struct SettingsScreen* s = (struct SettingsScreen*)s_;
s->widgets = s->_widgets; s->widgets = s->_widgets;
LLine_Init(s_, &s->sep, 380);
LButton_Init(s_, &s->btnUpdates, 110, 35, "Updates"); LButton_Init(s_, &s->btnUpdates, 110, 35, "Updates");
LLabel_Init(s_, &s->lblUpdates, "&eGet the latest stuff"); LLabel_Init(s_, &s->lblUpdates, "&eGet the latest stuff");
@ -1445,9 +1450,13 @@ static void SettingsScreen_Init(struct LScreen* s_) {
LLabel_Init(s_, &s->lblColours, "&eChange how the launcher looks"); LLabel_Init(s_, &s->lblColours, "&eChange how the launcher looks");
#if defined CC_BUILD_MOBILE #if defined CC_BUILD_MOBILE
LLabel_Init(s_, &s->lblOrientlock, "Force landscape"); LLabel_Init(s_, &s->lblExtra, "Force landscape");
LCheckbox_Init(s_, &s->cbOrientlock); LCheckbox_Init(s_, &s->cbExtra);
s->cbOrientlock.OnClick = SettingsScreen_LockOrientation; s->cbOrientlock.OnClick = SettingsScreen_LockOrientation;
#else
LLabel_Init(s_, &s->lblExtra, "Close this after game starts");
LCheckbox_Init(s_, &s->cbExtra);
s->cbExtra.OnClick = SettingsScreen_AutoClose;
#endif #endif
LButton_Init(s_, &s->btnBack, 80, 35, "Back"); LButton_Init(s_, &s->btnBack, 80, 35, "Back");
@ -1462,8 +1471,11 @@ static void SettingsScreen_Show(struct LScreen* s_) {
struct SettingsScreen* s = (struct SettingsScreen*)s_; struct SettingsScreen* s = (struct SettingsScreen*)s_;
s->btnColours.hidden = Options_GetBool(OPT_CLASSIC_MODE, false); s->btnColours.hidden = Options_GetBool(OPT_CLASSIC_MODE, false);
s->lblColours.hidden = s->btnColours.hidden; s->lblColours.hidden = s->btnColours.hidden;
#if defined CC_BUILD_MOBILE #if defined CC_BUILD_MOBILE
s->cbOrientlock.value = Options_GetBool(OPT_LANDSCAPE_MODE, false); s->cbExtra.value = Options_GetBool(OPT_LANDSCAPE_MODE, false);
#else
s->cbExtra.value = Options_GetBool(OPT_AUTO_CLOSE_LAUNCHER, false);
#endif #endif
} }
@ -1478,9 +1490,13 @@ static void SettingsScreen_Layout(struct LScreen* s_) {
LWidget_SetLocation(&s->btnColours, ANCHOR_CENTRE, ANCHOR_CENTRE, -135, -20); LWidget_SetLocation(&s->btnColours, ANCHOR_CENTRE, ANCHOR_CENTRE, -135, -20);
LWidget_SetLocation(&s->lblColours, ANCHOR_CENTRE_MIN, ANCHOR_CENTRE, -70, -20); LWidget_SetLocation(&s->lblColours, ANCHOR_CENTRE_MIN, ANCHOR_CENTRE, -70, -20);
LWidget_SetLocation(&s->sep, ANCHOR_CENTRE, ANCHOR_CENTRE, 0, 15);
#if defined CC_BUILD_MOBILE #if defined CC_BUILD_MOBILE
LWidget_SetLocation(&s->cbOrientlock, ANCHOR_CENTRE, ANCHOR_CENTRE, -178, 24); LWidget_SetLocation(&s->cbExtra, ANCHOR_CENTRE, ANCHOR_CENTRE, -178, 44);
LWidget_SetLocation(&s->lblOrientlock, ANCHOR_CENTRE, ANCHOR_CENTRE, -84, 24); LWidget_SetLocation(&s->lblExtra, ANCHOR_CENTRE, ANCHOR_CENTRE, -84, 44);
#else
LWidget_SetLocation(&s->cbExtra, ANCHOR_CENTRE, ANCHOR_CENTRE, -178, 44);
LWidget_SetLocation(&s->lblExtra, ANCHOR_CENTRE, ANCHOR_CENTRE, -42, 44);
#endif #endif
LWidget_SetLocation(&s->btnBack, ANCHOR_CENTRE, ANCHOR_CENTRE, 0, 170); LWidget_SetLocation(&s->btnBack, ANCHOR_CENTRE, ANCHOR_CENTRE, 0, 170);