summaryrefslogtreecommitdiff
path: root/src/ui/sidebarwidget.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/sidebarwidget.c')
-rw-r--r--src/ui/sidebarwidget.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 057ff614..42661f6b 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -188,7 +188,7 @@ static iLabelWidget *addActionButton_SidebarWidget_(iSidebarWidget *d, const cha
188 // extraPadding_WidgetFlag : 0) | 188 // extraPadding_WidgetFlag : 0) |
189 flags); 189 flags);
190 setFont_LabelWidget(btn, deviceType_App() == phone_AppDeviceType && d->side == right_SidebarSide 190 setFont_LabelWidget(btn, deviceType_App() == phone_AppDeviceType && d->side == right_SidebarSide
191 ? defaultBig_FontId 191 ? uiLabelBig_FontId
192 : d->buttonFont); 192 : d->buttonFont);
193 checkIcon_LabelWidget(btn); 193 checkIcon_LabelWidget(btn);
194 return btn; 194 return btn;
@@ -742,7 +742,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
742 d->itemFonts[1] = uiContentBold_FontId; 742 d->itemFonts[1] = uiContentBold_FontId;
743#if defined (iPlatformMobile) 743#if defined (iPlatformMobile)
744 if (deviceType_App() == phone_AppDeviceType) { 744 if (deviceType_App() == phone_AppDeviceType) {
745 d->itemFonts[0] = defaultBig_FontId; 745 d->itemFonts[0] = uiLabelBig_FontId;
746 d->itemFonts[1] = defaultBigBold_FontId; 746 d->itemFonts[1] = defaultBigBold_FontId;
747 } 747 }
748 d->widthAsGaps = 73.0f; 748 d->widthAsGaps = 73.0f;
@@ -774,7 +774,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
774 format_CStr("%s.mode arg:%d", cstr_String(id_Widget(w)), i))), 774 format_CStr("%s.mode arg:%d", cstr_String(id_Widget(w)), i))),
775 frameless_WidgetFlag | noBackground_WidgetFlag); 775 frameless_WidgetFlag | noBackground_WidgetFlag);
776 } 776 }
777 setButtonFont_SidebarWidget(d, isPhone ? defaultBig_FontId : uiLabel_FontId); 777 setButtonFont_SidebarWidget(d, isPhone ? uiLabelBig_FontId : uiLabel_FontId);
778 addChildFlags_Widget(vdiv, 778 addChildFlags_Widget(vdiv,
779 iClob(buttons), 779 iClob(buttons),
780 arrangeHorizontal_WidgetFlag | 780 arrangeHorizontal_WidgetFlag |
@@ -936,8 +936,8 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
936 if (deviceType_App() == phone_AppDeviceType) { 936 if (deviceType_App() == phone_AppDeviceType) {
937 /* Change font size depending on orientation. */ 937 /* Change font size depending on orientation. */
938 const int fonts[2] = { 938 const int fonts[2] = {
939 isPortrait_App() ? defaultBig_FontId : uiContent_FontId, 939 isPortrait_App() ? uiLabelBig_FontId : uiContent_FontId,
940 isPortrait_App() ? defaultBigBold_FontId : uiContentBold_FontId 940 isPortrait_App() ? uiLabelBigBold_FontId : uiContentBold_FontId
941 }; 941 };
942 if (d->itemFonts[0] != fonts[0]) { 942 if (d->itemFonts[0] != fonts[0]) {
943 d->itemFonts[0] = fonts[0]; 943 d->itemFonts[0] = fonts[0];
@@ -945,7 +945,7 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
945// updateMetrics_SidebarWidget_(d); 945// updateMetrics_SidebarWidget_(d);
946 updateItemHeight_SidebarWidget_(d); 946 updateItemHeight_SidebarWidget_(d);
947 } 947 }
948 setButtonFont_SidebarWidget(d, isPortrait_App() ? defaultBig_FontId : uiLabel_FontId); 948 setButtonFont_SidebarWidget(d, isPortrait_App() ? uiLabelBig_FontId : uiLabel_FontId);
949 } 949 }
950 const iBool isTight = 950 const iBool isTight =
951 (width_Rect(bounds_Widget(as_Widget(d->modeButtons[0]))) < d->maxButtonLabelWidth); 951 (width_Rect(bounds_Widget(as_Widget(d->modeButtons[0]))) < d->maxButtonLabelWidth);
@@ -1962,7 +1962,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
1962 deinit_String(&str); 1962 deinit_String(&str);
1963 const iInt2 textPos = addY_I2(topRight_Rect(iconArea), (itemHeight - lineHeight_Text(font)) / 2); 1963 const iInt2 textPos = addY_I2(topRight_Rect(iconArea), (itemHeight - lineHeight_Text(font)) / 2);
1964 drawRange_Text(font, textPos, fg, range_String(&d->label)); 1964 drawRange_Text(font, textPos, fg, range_String(&d->label));
1965 const int metaFont = default_FontId; 1965 const int metaFont = uiLabel_FontId;
1966 const int metaIconWidth = 4.5f * gap_UI; 1966 const int metaIconWidth = 4.5f * gap_UI;
1967 const iInt2 metaPos = 1967 const iInt2 metaPos =
1968 init_I2(right_Rect(itemRect) - 1968 init_I2(right_Rect(itemRect) -
@@ -2045,7 +2045,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
2045 const int indent = 1.4f * lineHeight_Text(font); 2045 const int indent = 1.4f * lineHeight_Text(font);
2046 addv_I2(&cPos, 2046 addv_I2(&cPos,
2047 init_I2(3 * gap_UI, 2047 init_I2(3 * gap_UI,
2048 (itemHeight - lineHeight_Text(default_FontId) * 2 - lineHeight_Text(font)) / 2048 (itemHeight - lineHeight_Text(uiLabel_FontId) * 2 - lineHeight_Text(font)) /
2049 2)); 2049 2));
2050 const int metaFg = isHover ? permanent_ColorId | (isPressing ? uiTextPressed_ColorId 2050 const int metaFg = isHover ? permanent_ColorId | (isPressing ? uiTextPressed_ColorId
2051 : uiTextFramelessHover_ColorId) 2051 : uiTextFramelessHover_ColorId)
@@ -2064,7 +2064,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
2064 add_I2(cPos, init_I2(indent, 0)), 2064 add_I2(cPos, init_I2(indent, 0)),
2065 fg, 2065 fg,
2066 range_String(&d->label)); 2066 range_String(&d->label));
2067 drawRange_Text(default_FontId, 2067 drawRange_Text(uiLabel_FontId,
2068 add_I2(cPos, init_I2(indent, lineHeight_Text(font))), 2068 add_I2(cPos, init_I2(indent, lineHeight_Text(font))),
2069 metaFg, 2069 metaFg,
2070 range_String(&d->meta)); 2070 range_String(&d->meta));