summaryrefslogtreecommitdiff
path: root/src/ui/util.c
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-12-06 08:11:31 +0200
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-12-06 08:11:31 +0200
commitf3e1ede71056e121b80206055fab0b4045107c2f (patch)
treebcbf2af63c441e16fd305ea29fbaac3d789a2583 /src/ui/util.c
parentf135d7c989e397d00434d8e8b4b90dbb9a9950bd (diff)
Mobile: Tablet fixes
Various issues with safe areas and font sizes.
Diffstat (limited to 'src/ui/util.c')
-rw-r--r--src/ui/util.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ui/util.c b/src/ui/util.c
index 8aedef99..9576f5e2 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -924,17 +924,17 @@ static void updateMenuItemFonts_Widget_(iWidget *d) {
924 if (isWrapped_LabelWidget(label)) { 924 if (isWrapped_LabelWidget(label)) {
925 continue; 925 continue;
926 } 926 }
927 if (deviceType_App() == desktop_AppDeviceType) { 927 switch (deviceType_App()) {
928 setFont_LabelWidget(label, isCaution ? uiLabelBold_FontId : uiLabel_FontId); 928 case desktop_AppDeviceType:
929 setFont_LabelWidget(label, isCaution ? uiLabelBold_FontId : uiLabel_FontId);
930 break;
931 case tablet_AppDeviceType:
932 setFont_LabelWidget(label, isCaution ? uiLabelMediumBold_FontId : uiLabelMedium_FontId);
933 break;
934 case phone_AppDeviceType:
935 setFont_LabelWidget(label, isCaution ? uiLabelBigBold_FontId : uiLabelBig_FontId);
936 break;
929 } 937 }
930 else { //if (isPortraitPhone) {
931 //if (!isSlidePanel) {
932 setFont_LabelWidget(label, isCaution ? uiLabelBigBold_FontId : uiLabelBig_FontId);
933 // }
934 }
935// else {
936// setFont_LabelWidget(label, isCaution ? uiContentBold_FontId : uiContent_FontId);
937// }
938 } 938 }
939 else if (childCount_Widget(i.object)) { 939 else if (childCount_Widget(i.object)) {
940 updateMenuItemFonts_Widget_(i.object); 940 updateMenuItemFonts_Widget_(i.object);
@@ -1734,7 +1734,7 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
1734 addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag); 1734 addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
1735 } 1735 }
1736 int fonts[2] = { uiLabel_FontId, uiLabelBold_FontId }; 1736 int fonts[2] = { uiLabel_FontId, uiLabelBold_FontId };
1737 if (deviceType_App() == phone_AppDeviceType) { 1737 if (deviceType_App() != desktop_AppDeviceType) {
1738 fonts[0] = uiLabelBig_FontId; 1738 fonts[0] = uiLabelBig_FontId;
1739 fonts[1] = uiLabelBigBold_FontId; 1739 fonts[1] = uiLabelBigBold_FontId;
1740 } 1740 }