summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/app.c14
-rw-r--r--src/ui/util.c7
-rw-r--r--src/ui/window.c4
3 files changed, 15 insertions, 10 deletions
diff --git a/src/app.c b/src/app.c
index 5cfa8af1..a1475d1c 100644
--- a/src/app.c
+++ b/src/app.c
@@ -639,14 +639,14 @@ static void init_App_(iApp *d, int argc, char **argv) {
639#endif 639#endif
640 init_Prefs(&d->prefs); 640 init_Prefs(&d->prefs);
641 setCStr_String(&d->prefs.downloadDir, downloadDir_App_()); 641 setCStr_String(&d->prefs.downloadDir, downloadDir_App_());
642 d->isRunning = iFalse;
643 d->window = NULL;
644 set_Atomic(&d->pendingRefresh, iFalse); 642 set_Atomic(&d->pendingRefresh, iFalse);
645 d->mimehooks = new_MimeHooks(); 643 d->isRunning = iFalse;
646 d->certs = new_GmCerts(dataDir_App_()); 644 d->window = NULL;
647 d->visited = new_Visited(); 645 d->mimehooks = new_MimeHooks();
648 d->bookmarks = new_Bookmarks(); 646 d->certs = new_GmCerts(dataDir_App_());
649 d->tabEnum = 0; /* generates unique IDs for tab pages */ 647 d->visited = new_Visited();
648 d->bookmarks = new_Bookmarks();
649 d->tabEnum = 0; /* generates unique IDs for tab pages */
650 init_Periodic(&d->periodic); 650 init_Periodic(&d->periodic);
651 setThemePalette_Color(d->prefs.theme); 651 setThemePalette_Color(d->prefs.theme);
652#if defined (iPlatformAppleDesktop) 652#if defined (iPlatformAppleDesktop)
diff --git a/src/ui/util.c b/src/ui/util.c
index cdc58154..5656c2c0 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1020,7 +1020,7 @@ static void updateSheetPanelMetrics_(iWidget *sheet) {
1020 navi->rect.pos = init_I2(left, top); 1020 navi->rect.pos = init_I2(left, top);
1021 iConstForEach(PtrArray, i, findChildren_Widget(sheet, "panel.toppad")) { 1021 iConstForEach(PtrArray, i, findChildren_Widget(sheet, "panel.toppad")) {
1022 iWidget *pad = *i.value; 1022 iWidget *pad = *i.value;
1023 setSize_Widget(pad, init1_I2(naviHeight)); 1023 setFixedSize_Widget(pad, init1_I2(naviHeight));
1024 } 1024 }
1025#endif 1025#endif
1026 setFixedSize_Widget(navi, init_I2(-1, naviHeight)); 1026 setFixedSize_Widget(navi, init_I2(-1, naviHeight));
@@ -1916,7 +1916,10 @@ void updatePreferencesLayout_Widget(iWidget *prefs) {
1916 as_Widget(input)->rect.size.x = 0; 1916 as_Widget(input)->rect.size.x = 0;
1917 } 1917 }
1918 } 1918 }
1919 as_Widget(findChild_Widget(prefs, "bindings"))->rect.size.x = 0; 1919 iWidget *bindings = findChild_Widget(prefs, "bindings");
1920 if (bindings) {
1921 bindings->rect.size.x = 0;
1922 }
1920 resizeToLargestPage_Widget(tabs); 1923 resizeToLargestPage_Widget(tabs);
1921 arrange_Widget(prefs); 1924 arrange_Widget(prefs);
1922 iForIndices(i, inputIds) { 1925 iForIndices(i, inputIds) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 94b84935..21864dce 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1596,6 +1596,7 @@ static void checkPixelRatioChange_Window_(iWindow *d) {
1596 1596
1597static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) { 1597static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
1598 switch (ev->event) { 1598 switch (ev->event) {
1599#if defined (iPlatformDesktop)
1599 case SDL_WINDOWEVENT_EXPOSED: 1600 case SDL_WINDOWEVENT_EXPOSED:
1600 if (!d->isExposed) { 1601 if (!d->isExposed) {
1601 drawBlank_Window_(d); /* avoid showing system-provided contents */ 1602 drawBlank_Window_(d); /* avoid showing system-provided contents */
@@ -1615,7 +1616,6 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
1615 } 1616 }
1616#endif 1617#endif
1617 return iFalse; 1618 return iFalse;
1618#if defined (iPlatformDesktop)
1619 case SDL_WINDOWEVENT_MOVED: { 1619 case SDL_WINDOWEVENT_MOVED: {
1620 if (d->isMinimized) { 1620 if (d->isMinimized) {
1621 return iFalse; 1621 return iFalse;
@@ -1721,8 +1721,10 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
1721 setCapsLockDown_Keys(iFalse); 1721 setCapsLockDown_Keys(iFalse);
1722 postCommand_App("window.focus.gained"); 1722 postCommand_App("window.focus.gained");
1723#if defined (iPlatformMobile) 1723#if defined (iPlatformMobile)
1724 d->isExposed = iTrue; /* no expose event is sent, so now we know it's visible */
1724 /* Returned to foreground, may have lost buffered content. */ 1725 /* Returned to foreground, may have lost buffered content. */
1725 invalidate_Window_(d); 1726 invalidate_Window_(d);
1727 postRefresh_App();
1726#endif 1728#endif
1727 return iFalse; 1729 return iFalse;
1728 case SDL_WINDOWEVENT_FOCUS_LOST: 1730 case SDL_WINDOWEVENT_FOCUS_LOST: