summaryrefslogtreecommitdiff
path: root/src/ui/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/window.c')
-rw-r--r--src/ui/window.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/ui/window.c b/src/ui/window.c
index b8d8ae5f..0f289ff4 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -858,22 +858,18 @@ static void updateMetrics_Window_(iWindow *d) {
858 setSize_Widget(appClose, appMin->rect.size); 858 setSize_Widget(appClose, appMin->rect.size);
859 setSize_Widget(appIcon, init_I2(appIconSize_(), appMin->rect.size.y)); 859 setSize_Widget(appIcon, init_I2(appIconSize_(), appMin->rect.size.y));
860 } 860 }
861 iWidget *navBar = findChild_Widget(d->root, "navbar"); 861 iWidget *navBar = findChild_Widget(d->root, "navbar");
862 iWidget *lock = findChild_Widget(navBar, "navbar.lock"); 862 iWidget *lock = findChild_Widget(navBar, "navbar.lock");
863 iWidget *url = findChild_Widget(d->root, "url"); 863 iWidget *url = findChild_Widget(d->root, "url");
864// iWidget *fprog = findChild_Widget(navBar, "feeds.progress");
865// iWidget *docProg = findChild_Widget(navBar, "document.progress");
866// iWidget *indSearch = findChild_Widget(navBar, "input.indicator.search");
867 iWidget *rightEmbed = findChild_Widget(navBar, "url.rightembed"); 864 iWidget *rightEmbed = findChild_Widget(navBar, "url.rightembed");
865 iWidget *embedPad = findChild_Widget(navBar, "url.embedpad");
868 setPadding_Widget(as_Widget(url), 0, gap_UI, 0, gap_UI); 866 setPadding_Widget(as_Widget(url), 0, gap_UI, 0, gap_UI);
869 navBar->rect.size.y = 0; /* recalculate height based on children (FIXME: shouldn't be needed) */ 867 navBar->rect.size.y = 0; /* recalculate height based on children (FIXME: shouldn't be needed) */
870 updateSize_LabelWidget((iLabelWidget *) lock); 868 updateSize_LabelWidget((iLabelWidget *) lock);
869 setSize_Widget(embedPad, init_I2(width_Widget(lock) + gap_UI / 2, 1));
871 setContentPadding_InputWidget((iInputWidget *) url, width_Widget(lock) * 0.75, 870 setContentPadding_InputWidget((iInputWidget *) url, width_Widget(lock) * 0.75,
872 width_Widget(lock) * 0.75); 871 width_Widget(lock) * 0.75);
873 rightEmbed->rect.pos.y = gap_UI; 872 rightEmbed->rect.pos.y = gap_UI;
874// fprog->rect.pos.y = gap_UI;
875// docProg->rect.pos.y = gap_UI;
876// indSearch->rect.pos.y = gap_UI;
877 updatePadding_Window_(d); 873 updatePadding_Window_(d);
878 arrange_Widget(d->root); 874 arrange_Widget(d->root);
879 postRefresh_App(); 875 postRefresh_App();
@@ -1021,8 +1017,9 @@ static void setupUserInterface_Window(iWindow *d) {
1021 /* Reload button. */ 1017 /* Reload button. */
1022 iLabelWidget *reload = newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"); 1018 iLabelWidget *reload = newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload");
1023 setId_Widget(as_Widget(reload), "reload"); 1019 setId_Widget(as_Widget(reload), "reload");
1024 addChildFlags_Widget(rightEmbed, iClob(reload), embedFlags); 1020 addChildFlags_Widget(as_Widget(url), iClob(reload), embedFlags | moveToParentRightEdge_WidgetFlag);
1025 updateSize_LabelWidget(reload); 1021 updateSize_LabelWidget(reload);
1022 setId_Widget(addChild_Widget(rightEmbed, iClob(makePadding_Widget(0))), "url.embedpad");
1026 } 1023 }
1027 addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag); 1024 addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);
1028 setId_Widget(addChildFlags_Widget(navBar, 1025 setId_Widget(addChildFlags_Widget(navBar,