X11: Tuning popup window behavior and appearance

4 files changed, 32 insertions, 12 deletions

diff --git a/src/app.c b/src/app.c
index 95501ce3..e0cae4e8 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1281,8 +1281,7 @@ void processEvents_App(enum iAppEventMode eventMode) {
 #endif
                 /* Per-window processing. */
                 iBool wasUsed = iFalse;
-                const iPtrArray *windows = listWindows_App_(d);
-                iConstForEach(PtrArray, iter, windows) {
+                iConstForEach(PtrArray, iter, listWindows_App_(d)) {
                     iWindow *window = iter.ptr;
                     setCurrent_Window(window);
                     window->lastHover = window->hover;
@@ -1312,7 +1311,7 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     handleCommand_MacOS(command_UserEvent(&ev));
 #endif
                     if (isMetricsChange_UserEvent(&ev)) {
-                        iConstForEach(PtrArray, iter, windows) {
+                        iConstForEach(PtrArray, iter, listWindows_App_(d)) {
                             iWindow *window = iter.ptr;
                             iForIndices(i, window->roots) {
                                 iRoot *root = window->roots[i];
@@ -1331,7 +1330,7 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     free(ev.user.data1);
                 }
                 /* Refresh after hover changes. */ {
-                    iConstForEach(PtrArray, iter, windows) {
+                    iConstForEach(PtrArray, iter, listWindows_App_(d)) {
                         iWindow *window = iter.ptr;
                         if (window->lastHover != window->hover) {
                             refresh_Widget(window->lastHover);
@@ -3030,3 +3029,10 @@ iStringSet *listOpenURLs_App(void) {
 iMainWindow *mainWindow_App(void) {
     return app_.window;
 }
+
+void closePopups_App(void) {
+    iApp *d = &app_;
+    iConstForEach(PtrArray, i, &d->popupWindows) {
+        postCommand_Root(((const iWindow *) i.ptr)->roots[0], "cancel");
+    }
+}
diff --git a/src/app.h b/src/app.h
index 0dff939f..5014c741 100644
--- a/src/app.h
+++ b/src/app.h
@@ -134,7 +134,8 @@ iLocalDef void postCommand_App(const char *command) {
 
 iDocumentWidget *   document_Command    (const char *cmd);
 
-void        openInDefaultBrowser_App    (const iString *url);
-void        revealPath_App              (const iString *path);
+void            openInDefaultBrowser_App(const iString *url);
+void            revealPath_App          (const iString *path);
 
-iMainWindow *mainWindow_App(void);
+iMainWindow *   mainWindow_App  (void);
+void            closePopups_App (void);
diff --git a/src/ui/util.c b/src/ui/util.c
index 2a0c89dc..c2bc8f08 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1047,10 +1047,15 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) {
                 SDL_GetWindowSize(sdlWin, &winSize.x, &winSize.y);
                 menuPos = sub_I2(add_I2(winPos, divi_I2(winSize, 2)), divi_I2(menuSize, 2));
             }
-            SDL_Rect displayRect;
-            SDL_GetDisplayBounds(SDL_GetWindowDisplayIndex(get_Window()->win), &displayRect);
-            menuPos.x = iMin(menuPos.x, displayRect.x + displayRect.w - menuSize.x);
-            menuPos.y = iMin(menuPos.y, displayRect.y + displayRect.h - menuSize.y);
+            iRect displayRect = zero_Rect();
+            for (int i = 0; i < SDL_GetNumVideoDisplays(); i++) {
+                SDL_Rect dispBounds;
+                SDL_GetDisplayBounds(i, &dispBounds);
+                displayRect = union_Rect(
+                    displayRect, init_Rect(dispBounds.x, dispBounds.y, dispBounds.w, dispBounds.h));
+            }
+            menuPos.x = iMin(menuPos.x, right_Rect(displayRect) - menuSize.x);
+            menuPos.y = iMin(menuPos.y, bottom_Rect(displayRect) - menuSize.y);
         }
         iWindow *win = newPopup_Window(menuPos, d); /* window takes the widget */
         SDL_SetWindowTitle(win->win, "Menu");
@@ -1080,6 +1085,9 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, int menuOpenFlags) {
             d->rect.pos = init_I2(0, rootSize.y);
         }
     }
+    else if (menuOpenFlags & center_MenuOpenFlags) {
+        d->rect.pos = sub_I2(divi_I2(size_Root(d->root), 2), divi_I2(d->rect.size, 2));
+    }
     else {
         d->rect.pos = windowToLocal_Widget(d, windowCoord);
     }
diff --git a/src/ui/window.c b/src/ui/window.c
index 77e49dbb..80493845 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -750,6 +750,7 @@ static iBool handleWindowEvent_MainWindow_(iMainWindow *d, const SDL_WindowEvent
             if (d->base.isMinimized) {
                 return iFalse;
             }
+            closePopups_App();
             checkPixelRatioChange_Window_(as_Window(d));
             const iInt2 newPos = init_I2(ev->data1, ev->data2);
             if (isEqual_I2(newPos, init1_I2(-32000))) { /* magic! */
@@ -808,6 +809,7 @@ static iBool handleWindowEvent_MainWindow_(iMainWindow *d, const SDL_WindowEvent
                 // updateSize_Window_(d, iTrue);
                 return iTrue;
             }
+            closePopups_App();
             if (unsnap_MainWindow_(d, NULL)) {
                 return iTrue;
             }
@@ -827,6 +829,7 @@ static iBool handleWindowEvent_MainWindow_(iMainWindow *d, const SDL_WindowEvent
             return iTrue;
         case SDL_WINDOWEVENT_MINIMIZED:
             d->base.isMinimized = iTrue;
+            closePopups_App();
             return iTrue;
 #else /* if defined (!iPlatformDesktop) */
         case SDL_WINDOWEVENT_RESIZED:
@@ -861,6 +864,7 @@ static iBool handleWindowEvent_MainWindow_(iMainWindow *d, const SDL_WindowEvent
 #if !defined (iPlatformDesktop)
             setFreezeDraw_MainWindow(d, iTrue);
 #endif
+            closePopups_App();
             return iFalse;
         case SDL_WINDOWEVENT_TAKE_FOCUS:
             SDL_SetWindowInputFocus(d->base.win);
@@ -1124,7 +1128,8 @@ void draw_Window(iWindow *d) {
         drawCount_ = 0;
 #endif
     }
-//    drawRectThickness_Paint(&p, (iRect){ zero_I2(), sub_I2(d->size, one_I2()) }, gap_UI / 4, uiSeparator_ColorId);
+    drawRectThickness_Paint(
+        &p, (iRect){ zero_I2(), sub_I2(d->size, one_I2()) }, gap_UI / 4, uiSeparator_ColorId);
     setCurrent_Root(NULL);
     SDL_RenderPresent(d->render);
 }