diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-14 22:12:19 +0300 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-06-14 22:12:19 +0300 |
commit | 4bcb7acb840627a197f8e9ed40256fc8ac0a01a9 (patch) | |
tree | 1c0c6dbeb0a4b23df83253bf2ad97e9663907139 /src/ui/root.c | |
parent | acad729245e09d927f1b16de2c6619b84f88c59e (diff) |
Mobile: Toolbar color depends on sidebar
Toolbar should reflect the colors of the current view, whether it's a page or the sidebar.
Diffstat (limited to 'src/ui/root.c')
-rw-r--r-- | src/ui/root.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/ui/root.c b/src/ui/root.c index 0a5eb96e..6c00db0f 100644 --- a/src/ui/root.c +++ b/src/ui/root.c | |||
@@ -514,6 +514,24 @@ void updatePadding_Root(iRoot *d) { | |||
514 | #endif | 514 | #endif |
515 | } | 515 | } |
516 | 516 | ||
517 | void updateToolbarColors_Root(iRoot *d) { | ||
518 | #if defined (iPlatformMobile) | ||
519 | iWidget *toolBar = findChild_Widget(d->widget, "toolbar"); | ||
520 | if (toolBar) { | ||
521 | const iBool isSidebarVisible = isVisible_Widget(findChild_Widget(d->widget, "sidebar")); | ||
522 | setBackgroundColor_Widget(toolBar, isSidebarVisible ? uiBackgroundSidebar_ColorId : | ||
523 | tmBannerBackground_ColorId); | ||
524 | iForEach(ObjectList, i, children_Widget(toolBar)) { | ||
525 | iLabelWidget *btn = i.object; | ||
526 | setTextColor_LabelWidget(i.object, isSidebarVisible ? uiTextDim_ColorId : | ||
527 | tmBannerIcon_ColorId); | ||
528 | } | ||
529 | } | ||
530 | #else | ||
531 | iUnused(d); | ||
532 | #endif | ||
533 | } | ||
534 | |||
517 | void dismissPortraitPhoneSidebars_Root(iRoot *d) { | 535 | void dismissPortraitPhoneSidebars_Root(iRoot *d) { |
518 | if (deviceType_App() == phone_AppDeviceType && isPortrait_App()) { | 536 | if (deviceType_App() == phone_AppDeviceType && isPortrait_App()) { |
519 | iWidget *sidebar = findChild_Widget(d->widget, "sidebar"); | 537 | iWidget *sidebar = findChild_Widget(d->widget, "sidebar"); |
@@ -1247,7 +1265,6 @@ void createUserInterface_Root(iRoot *d) { | |||
1247 | arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag | | 1265 | arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag | |
1248 | commandOnClick_WidgetFlag | | 1266 | commandOnClick_WidgetFlag | |
1249 | drawBackgroundToBottom_WidgetFlag, iTrue); | 1267 | drawBackgroundToBottom_WidgetFlag, iTrue); |
1250 | setBackgroundColor_Widget(toolBar, tmBannerBackground_ColorId); | ||
1251 | setId_Widget(addChildFlags_Widget(toolBar, | 1268 | setId_Widget(addChildFlags_Widget(toolBar, |
1252 | iClob(newLargeIcon_LabelWidget("\U0001f870", "navigate.back")), | 1269 | iClob(newLargeIcon_LabelWidget("\U0001f870", "navigate.back")), |
1253 | frameless_WidgetFlag), | 1270 | frameless_WidgetFlag), |
@@ -1269,12 +1286,13 @@ void createUserInterface_Root(iRoot *d) { | |||
1269 | setFont_LabelWidget(menuButton, uiLabelLarge_FontId); | 1286 | setFont_LabelWidget(menuButton, uiLabelLarge_FontId); |
1270 | setId_Widget(as_Widget(menuButton), "toolbar.navmenu"); | 1287 | setId_Widget(as_Widget(menuButton), "toolbar.navmenu"); |
1271 | addChildFlags_Widget(toolBar, iClob(menuButton), frameless_WidgetFlag); | 1288 | addChildFlags_Widget(toolBar, iClob(menuButton), frameless_WidgetFlag); |
1289 | // setBackgroundColor_Widget(toolBar, tmBannerBackground_ColorId); | ||
1272 | iForEach(ObjectList, i, children_Widget(toolBar)) { | 1290 | iForEach(ObjectList, i, children_Widget(toolBar)) { |
1273 | iLabelWidget *btn = i.object; | 1291 | iLabelWidget *btn = i.object; |
1274 | setFlags_Widget(i.object, noBackground_WidgetFlag, iTrue); | 1292 | setFlags_Widget(i.object, noBackground_WidgetFlag, iTrue); |
1275 | setTextColor_LabelWidget(i.object, tmBannerIcon_ColorId); | 1293 | // setTextColor_LabelWidget(i.object, tmBannerIcon_ColorId); |
1276 | // setBackgroundColor_Widget(i.object, tmBannerSideTitle_ColorId); | ||
1277 | } | 1294 | } |
1295 | updateToolbarColors_Root(d); | ||
1278 | const iMenuItem items[] = { | 1296 | const iMenuItem items[] = { |
1279 | { book_Icon " ${sidebar.bookmarks}", 0, 0, "toolbar.showview arg:0" }, | 1297 | { book_Icon " ${sidebar.bookmarks}", 0, 0, "toolbar.showview arg:0" }, |
1280 | { star_Icon " ${sidebar.feeds}", 0, 0, "toolbar.showview arg:1" }, | 1298 | { star_Icon " ${sidebar.feeds}", 0, 0, "toolbar.showview arg:1" }, |
@@ -1356,7 +1374,7 @@ void createUserInterface_Root(iRoot *d) { | |||
1356 | } | 1374 | } |
1357 | } | 1375 | } |
1358 | 1376 | ||
1359 | void showToolbars_Root(iRoot *d, iBool show) { | 1377 | void showToolbar_Root(iRoot *d, iBool show) { |
1360 | /* The toolbar is only used on phone portrait layout. */ | 1378 | /* The toolbar is only used on phone portrait layout. */ |
1361 | if (isLandscape_App()) return; | 1379 | if (isLandscape_App()) return; |
1362 | iWidget *toolBar = findChild_Widget(d->widget, "toolbar"); | 1380 | iWidget *toolBar = findChild_Widget(d->widget, "toolbar"); |