diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-01-01 15:22:43 +0200 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-01-01 15:22:43 +0200 |
commit | 3e371f7ea70b1c2e06e1af50c3b41efdecbd072b (patch) | |
tree | 05189b169ead7fa147c888a7cca90a2b1d8dbb8c /src/ui/util.c | |
parent | 5d247c7fafddcb46d83572af788a04f835d48d42 (diff) |
Android: Fixed root sizing; clip menu not showing; toolbar buttons
The keyboard height was miscalculated if there were system keys under the window.
Diffstat (limited to 'src/ui/util.c')
-rw-r--r-- | src/ui/util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ui/util.c b/src/ui/util.c index 6add5c89..c590caa9 100644 --- a/src/ui/util.c +++ b/src/ui/util.c | |||
@@ -1204,6 +1204,9 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) { | |||
1204 | leftExcess += l; | 1204 | leftExcess += l; |
1205 | rightExcess += r; | 1205 | rightExcess += r; |
1206 | } | 1206 | } |
1207 | #elif defined (iPlatformMobile) | ||
1208 | /* Reserve space for the keyboard. */ | ||
1209 | bottomExcess += get_MainWindow()->keyboardHeight; | ||
1207 | #endif | 1210 | #endif |
1208 | if (!allowOverflow) { | 1211 | if (!allowOverflow) { |
1209 | if (bottomExcess > 0 && (!isPortraitPhone || !isSlidePanel)) { | 1212 | if (bottomExcess > 0 && (!isPortraitPhone || !isSlidePanel)) { |
@@ -2495,8 +2498,9 @@ iWidget *makePreferences_Widget(void) { | |||
2495 | }; | 2498 | }; |
2496 | const iMenuItem colorPanelItems[] = { | 2499 | const iMenuItem colorPanelItems[] = { |
2497 | { "title id:heading.prefs.colors" }, | 2500 | { "title id:heading.prefs.colors" }, |
2498 | //{ "heading id:heading.prefs.uitheme" }, | 2501 | #if !defined (iPlatformAndroidMobile) |
2499 | { "toggle id:prefs.ostheme" }, | 2502 | { "toggle id:prefs.ostheme" }, |
2503 | #endif | ||
2500 | { "radio id:prefs.theme", 0, 0, (const void *) themeItems }, | 2504 | { "radio id:prefs.theme", 0, 0, (const void *) themeItems }, |
2501 | { "radio id:prefs.accent", 0, 0, (const void *) accentItems }, | 2505 | { "radio id:prefs.accent", 0, 0, (const void *) accentItems }, |
2502 | { "heading id:heading.prefs.pagecontent" }, | 2506 | { "heading id:heading.prefs.pagecontent" }, |