summaryrefslogtreecommitdiff
path: root/src/ui/root.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/root.c')
-rw-r--r--src/ui/root.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/ui/root.c b/src/ui/root.c
index c3a9596f..71f51ef0 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -432,9 +432,9 @@ static void updateNavBarIdentity_(iWidget *navBar) {
432 const iGmIdentity *ident = 432 const iGmIdentity *ident =
433 identityForUrl_GmCerts(certs_App(), url_DocumentWidget(document_App())); 433 identityForUrl_GmCerts(certs_App(), url_DocumentWidget(document_App()));
434 iWidget *button = findChild_Widget(navBar, "navbar.ident"); 434 iWidget *button = findChild_Widget(navBar, "navbar.ident");
435 iWidget *tool = findWidget_App("toolbar.ident"); 435 iLabelWidget *toolButton = findWidget_App("toolbar.ident");
436 setFlags_Widget(button, selected_WidgetFlag, ident != NULL); 436 setFlags_Widget(button, selected_WidgetFlag, ident != NULL);
437 setFlags_Widget(tool, selected_WidgetFlag, ident != NULL); 437 setOutline_LabelWidget(toolButton, ident == NULL);
438 /* Update menu. */ 438 /* Update menu. */
439 iLabelWidget *idItem = child_Widget(findChild_Widget(button, "menu"), 0); 439 iLabelWidget *idItem = child_Widget(findChild_Widget(button, "menu"), 0);
440 const iString *subjectName = ident ? name_GmIdentity(ident) : NULL; 440 const iString *subjectName = ident ? name_GmIdentity(ident) : NULL;
@@ -519,12 +519,14 @@ void updateToolbarColors_Root(iRoot *d) {
519 iWidget *toolBar = findChild_Widget(d->widget, "toolbar"); 519 iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
520 if (toolBar) { 520 if (toolBar) {
521 const iBool isSidebarVisible = isVisible_Widget(findChild_Widget(d->widget, "sidebar")); 521 const iBool isSidebarVisible = isVisible_Widget(findChild_Widget(d->widget, "sidebar"));
522 setBackgroundColor_Widget(toolBar, isSidebarVisible ? uiBackgroundSidebar_ColorId : 522 const int bg = isSidebarVisible ? uiBackgroundSidebar_ColorId :
523 tmBannerBackground_ColorId); 523 tmBannerBackground_ColorId;
524 setBackgroundColor_Widget(toolBar, bg);
524 iForEach(ObjectList, i, children_Widget(toolBar)) { 525 iForEach(ObjectList, i, children_Widget(toolBar)) {
525 iLabelWidget *btn = i.object; 526 iLabelWidget *btn = i.object;
526 setTextColor_LabelWidget(i.object, isSidebarVisible ? uiTextDim_ColorId : 527 setTextColor_LabelWidget(i.object, isSidebarVisible ? uiTextDim_ColorId :
527 tmBannerIcon_ColorId); 528 tmBannerIcon_ColorId);
529 setBackgroundColor_Widget(i.object, bg); /* using noBackground, but ident has outline */
528 } 530 }
529 } 531 }
530#else 532#else