diff options
Diffstat (limited to 'src/ui/window.c')
-rw-r--r-- | src/ui/window.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/ui/window.c b/src/ui/window.c index a3675ae5..1b6c5e89 100644 --- a/src/ui/window.c +++ b/src/ui/window.c | |||
@@ -875,10 +875,10 @@ static void updateMetrics_Window_(iWindow *d) { | |||
875 | iWidget *appMax = findChild_Widget(winBar, "winbar.max"); | 875 | iWidget *appMax = findChild_Widget(winBar, "winbar.max"); |
876 | iWidget *appClose = findChild_Widget(winBar, "winbar.close"); | 876 | iWidget *appClose = findChild_Widget(winBar, "winbar.close"); |
877 | setPadding_Widget(winBar, 0, gap_UI / 3, 0, 0); | 877 | setPadding_Widget(winBar, 0, gap_UI / 3, 0, 0); |
878 | setSize_Widget(appMin, init_I2(gap_UI * 11.5f, height_Widget(appTitle))); | 878 | setFixedSize_Widget(appMin, init_I2(gap_UI * 11.5f, height_Widget(appTitle))); |
879 | setSize_Widget(appMax, appMin->rect.size); | 879 | setFixedSize_Widget(appMax, appMin->rect.size); |
880 | setSize_Widget(appClose, appMin->rect.size); | 880 | setFixedSize_Widget(appClose, appMin->rect.size); |
881 | setSize_Widget(appIcon, init_I2(appIconSize_(), appMin->rect.size.y)); | 881 | setFixedSize_Widget(appIcon, init_I2(appIconSize_(), appMin->rect.size.y)); |
882 | } | 882 | } |
883 | iWidget *navBar = findChild_Widget(d->root, "navbar"); | 883 | iWidget *navBar = findChild_Widget(d->root, "navbar"); |
884 | iWidget *lock = findChild_Widget(navBar, "navbar.lock"); | 884 | iWidget *lock = findChild_Widget(navBar, "navbar.lock"); |
@@ -888,7 +888,7 @@ static void updateMetrics_Window_(iWindow *d) { | |||
888 | setPadding_Widget(as_Widget(url), 0, gap_UI, 0, gap_UI); | 888 | setPadding_Widget(as_Widget(url), 0, gap_UI, 0, gap_UI); |
889 | navBar->rect.size.y = 0; /* recalculate height based on children (FIXME: shouldn't be needed) */ | 889 | navBar->rect.size.y = 0; /* recalculate height based on children (FIXME: shouldn't be needed) */ |
890 | updateSize_LabelWidget((iLabelWidget *) lock); | 890 | updateSize_LabelWidget((iLabelWidget *) lock); |
891 | setSize_Widget(embedPad, init_I2(width_Widget(lock) + gap_UI / 2, 1)); | 891 | setFixedSize_Widget(embedPad, init_I2(width_Widget(lock) + gap_UI / 2, 1)); |
892 | setContentPadding_InputWidget((iInputWidget *) url, width_Widget(lock) * 0.75, | 892 | setContentPadding_InputWidget((iInputWidget *) url, width_Widget(lock) * 0.75, |
893 | width_Widget(lock) * 0.75); | 893 | width_Widget(lock) * 0.75); |
894 | rightEmbed->rect.pos.y = gap_UI; | 894 | rightEmbed->rect.pos.y = gap_UI; |
@@ -1251,6 +1251,7 @@ static void updateRootSize_Window_(iWindow *d, iBool notifyAlways) { | |||
1251 | const iInt2 oldSize = *size; | 1251 | const iInt2 oldSize = *size; |
1252 | SDL_GetRendererOutputSize(d->render, &size->x, &size->y); | 1252 | SDL_GetRendererOutputSize(d->render, &size->x, &size->y); |
1253 | size->y -= d->keyboardHeight; | 1253 | size->y -= d->keyboardHeight; |
1254 | d->root->minSize = *size; | ||
1254 | if (notifyAlways || !isEqual_I2(oldSize, *size)) { | 1255 | if (notifyAlways || !isEqual_I2(oldSize, *size)) { |
1255 | const iBool isHoriz = (d->place.lastNotifiedSize.x != size->x); | 1256 | const iBool isHoriz = (d->place.lastNotifiedSize.x != size->x); |
1256 | const iBool isVert = (d->place.lastNotifiedSize.y != size->y); | 1257 | const iBool isVert = (d->place.lastNotifiedSize.y != size->y); |
@@ -1465,7 +1466,7 @@ void init_Window(iWindow *d, iRect rect) { | |||
1465 | setupWindow_iOS(d); | 1466 | setupWindow_iOS(d); |
1466 | #endif | 1467 | #endif |
1467 | d->root = new_Widget(); | 1468 | d->root = new_Widget(); |
1468 | setFlags_Widget(d->root, focusRoot_WidgetFlag, iTrue); | 1469 | setFlags_Widget(d->root, fixedSize_WidgetFlag | focusRoot_WidgetFlag, iTrue); |
1469 | d->presentTime = 0.0; | 1470 | d->presentTime = 0.0; |
1470 | d->frameTime = SDL_GetTicks(); | 1471 | d->frameTime = SDL_GetTicks(); |
1471 | d->loadAnimTimer = 0; | 1472 | d->loadAnimTimer = 0; |
@@ -1840,7 +1841,9 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) { | |||
1840 | insertMacMenus_(); | 1841 | insertMacMenus_(); |
1841 | #endif | 1842 | #endif |
1842 | invalidate_Window_(d); | 1843 | invalidate_Window_(d); |
1844 | updatePreferencesLayout_Widget(findChild_Widget(d->root, "prefs")); | ||
1843 | arrange_Widget(d->root); | 1845 | arrange_Widget(d->root); |
1846 | printTree_Widget(findChild_Widget(d->root, "prefs")); | ||
1844 | } | 1847 | } |
1845 | if (oldHover != hover_Widget()) { | 1848 | if (oldHover != hover_Widget()) { |
1846 | postRefresh_App(); | 1849 | postRefresh_App(); |