From ce8c7efae7bbfd47579561b279e6afbb975ac4e8 Mon Sep 17 00:00:00 2001 From: igor725 Date: Sun, 22 Aug 2021 19:03:46 +0300 Subject: [PATCH] Fix 2 --- src/LScreens.c | 6 +++--- src/Window_Android.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/LScreens.c b/src/LScreens.c index 06c815c96..3bcfcdd72 100644 --- a/src/LScreens.c +++ b/src/LScreens.c @@ -1424,7 +1424,7 @@ static struct SettingsScreen { #if defined CC_BUILD_ANDROID static void SettingsScreen_LockOrientation(void* w, int idx) { struct LCheckbox* cb = (struct LCheckbox*)w; - cb->value ^= true; + cb->value = !cb->value; Options_SetBool(OPT_LANDSCAPE_MODE, cb->value); Window_LockLandscapeOrientation(cb->value); Launcher_Redraw(); @@ -1445,7 +1445,7 @@ static void SettingsScreen_Init(struct LScreen* s_) { LLabel_Init(s_, &s->lblColours, "&eChange how the launcher looks"); #if defined CC_BUILD_ANDROID - LLabel_Init(s_, &s->lblOrientlock, "Portrait orientation lock"); + LLabel_Init(s_, &s->lblOrientlock, "Force landscape"); LCheckbox_Init(s_, &s->cbOrientlock); s->cbOrientlock.OnClick = SettingsScreen_LockOrientation; #endif @@ -1480,7 +1480,7 @@ static void SettingsScreen_Layout(struct LScreen* s_) { #if defined CC_BUILD_ANDROID LWidget_SetLocation(&s->cbOrientlock, ANCHOR_CENTRE, ANCHOR_CENTRE, -178, 24); - LWidget_SetLocation(&s->lblOrientlock, ANCHOR_CENTRE, ANCHOR_CENTRE, -58, 24); + LWidget_SetLocation(&s->lblOrientlock, ANCHOR_CENTRE, ANCHOR_CENTRE, -84, 24); #endif LWidget_SetLocation(&s->btnBack, ANCHOR_CENTRE, ANCHOR_CENTRE, 0, 170); diff --git a/src/Window_Android.c b/src/Window_Android.c index ed20018f9..935c7eaae 100644 --- a/src/Window_Android.c +++ b/src/Window_Android.c @@ -410,8 +410,8 @@ void Window_LockLandscapeOrientation(cc_bool lock) { JavaGetCurrentEnv(env); /* SCREEN_ORIENTATION_SENSOR_LANDSCAPE = 0x00000006 */ - /* SCREEN_ORIENTATION_USER = 0x00000002 */ - args[0].i = lock ? 0x00000006 : 0x00000002; + /* SCREEN_ORIENTATION_UNSPECIFIED = 0xffffffff */ + args[0].i = lock ? 0x00000006 : 0xffffffff; JavaCallVoid(env, "setRequestedOrientation", "(I)V", args); }