From da9bd1a8fa18ee958baebb204ef7a2a18972a6ad Mon Sep 17 00:00:00 2001 From: Jaakko Keränen Date: Wed, 10 Mar 2021 17:28:05 +0200 Subject: Mobile: Adjusting sidebar appearance --- src/ui/sidebarwidget.c | 12 +++++++----- src/ui/window.c | 9 ++++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c index 8da09b2f..de61141f 100644 --- a/src/ui/sidebarwidget.c +++ b/src/ui/sidebarwidget.c @@ -544,11 +544,13 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) { // } } else { - iLabelWidget *heading = new_LabelWidget("Identities", NULL); - setBackgroundColor_Widget(as_Widget(heading), uiBackgroundUnfocusedSelection_ColorId); - setTextColor_LabelWidget(heading, uiIcon_ColorId); - setFont_LabelWidget(addChildFlags_Widget(vdiv, iClob(heading), frameless_WidgetFlag), - uiLabelLarge_FontId); + iLabelWidget *heading = new_LabelWidget(person_Icon " Identities", NULL); + checkIcon_LabelWidget(heading); + setBackgroundColor_Widget(as_Widget(heading), uiBackgroundSidebar_ColorId); + setTextColor_LabelWidget(heading, uiTextSelected_ColorId); + setFont_LabelWidget(addChildFlags_Widget(vdiv, iClob(heading), borderTop_WidgetFlag | + alignLeft_WidgetFlag | frameless_WidgetFlag), + uiLabelLargeBold_FontId); } iWidget *content = new_Widget(); setFlags_Widget(content, resizeChildren_WidgetFlag, iTrue); diff --git a/src/ui/window.c b/src/ui/window.c index afc05da9..2f7a2988 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -131,9 +131,12 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) { iSidebarWidget *sidebar = findChild_Widget(root, "sidebar"); removeChild_Widget(parent_Widget(sidebar), sidebar); setButtonFont_SidebarWidget(sidebar, isLandscape_App() ? uiLabel_FontId : uiLabelLarge_FontId); - setBackgroundColor_Widget(findChild_Widget(as_Widget(sidebar), "buttons"), - isPortrait_App() ? uiBackgroundUnfocusedSelection_ColorId - : uiBackground_ColorId); +// setBackgroundColor_Widget(findChild_Widget(as_Widget(sidebar), "buttons"), +// isPortrait_App() ? uiBackgroundUnfocusedSelection_ColorId +// : uiBackgroundSidebar_ColorId); + setFlags_Widget(findChild_Widget(as_Widget(sidebar), "buttons"), + borderTop_WidgetFlag, + isPortrait_App()); if (isLandscape_App()) { addChildPos_Widget(findChild_Widget(root, "tabs.content"), iClob(sidebar), front_WidgetAddPos); setWidth_SidebarWidget(sidebar, 73 * gap_UI); -- cgit v1.2.3