Windows: Further custom frame improvements

Saving the window rectangle and snap mode. Frame title alignment.

5 files changed, 39 insertions, 22 deletions

diff --git a/src/app.c b/src/app.c
index 64ddd70e..b815a0ab 100644
--- a/src/app.c
+++ b/src/app.c
@@ -160,7 +160,6 @@ static iString *serializePrefs_App_(const iApp *d) {
     const iSidebarWidget *sidebar2 = findWidget_App("sidebar2");
     appendFormat_String(str, "window.retain arg:%d\n", d->prefs.retainWindowSize);
     if (d->prefs.retainWindowSize) {
-        const iBool isMaximized = snap_Window(d->window) == maximized_WindowSnap;
         int w, h, x, y;
         x = d->window->place.normalRect.pos.x;
         y = d->window->place.normalRect.pos.y;
@@ -171,12 +170,22 @@ static iString *serializePrefs_App_(const iApp *d) {
         appendFormat_String(str, "sidebar2.width arg:%d\n", width_SidebarWidget(sidebar2));
         /* On macOS, maximization should be applied at creation time or the window will take
            a moment to animate to its maximized size. */
-#if !defined (iPlatformApple)
-        if (isMaximized) {
+#if defined (LAGRANGE_CUSTOM_FRAME)
+        if (snap_Window(d->window)) {
+            if (~SDL_GetWindowFlags(d->window->win) & SDL_WINDOW_MINIMIZED) {
+                /* Save the actual visible window position, too, because snapped windows may
+                   still be resized/moved without affecting normalRect. */
+                SDL_GetWindowPosition(d->window->win, &x, &y);
+                SDL_GetWindowSize(d->window->win, &w, &h);
+                appendFormat_String(
+                    str, "~window.setrect snap:%d width:%d height:%d coord:%d %d\n", 
+                    snap_Window(d->window), w, h, x, y);
+            }          
+        }
+#elif !defined (iPlatformApple)
+        if (snap_Window(d->window) == maximized_WindowSnap) {
             appendFormat_String(str, "~window.maximize\n");
         }
-#else
-        iUnused(isMaximized);
 #endif
     }
     /* Sidebars. */ {
@@ -274,7 +283,7 @@ static void loadPrefs_App_(iApp *d) {
             if (equal_Command(cmd, "uiscale")) {
                 setUiScale_Window(get_Window(), argf_Command(cmd));
             }
-            else if (equal_Command(cmd, "window.setrect")) {
+            else if (equal_Command(cmd, "window.setrect") && !argLabel_Command(cmd, "snap")) {
                 const iInt2 pos = coord_Command(cmd);
                 d->initialWindowRect = init_Rect(
                     pos.x, pos.y, argLabel_Command(cmd, "width"), argLabel_Command(cmd, "height"));
diff --git a/src/ui/text.c b/src/ui/text.c
index 218e7565..71a26250 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1110,6 +1110,7 @@ void drawCentered_Text(int fontId, iRect rect, iBool alignVisual, int color, con
     iRect          textBounds = alignVisual ? visualBounds_Text(fontId, text)
                                    : (iRect){ zero_I2(), advanceRange_Text(fontId, text) };
     textBounds.pos = sub_I2(mid_Rect(rect), mid_Rect(textBounds));
+    textBounds.pos.x = iMax(textBounds.pos.x, left_Rect(rect)); /* keep left edge visible */
     draw_Text_(fontId, textBounds.pos, color, text);
     deinit_Block(&chars);
 }
diff --git a/src/ui/window.c b/src/ui/window.c
index 65386e14..a59aa135 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -93,6 +93,19 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         setTextColor_LabelWidget(findWidget_App("winbar.title"), uiTextStrong_ColorId);
         return iFalse;
     }
+    else if (equal_Command(cmd, "window.setrect")) {
+        const int snap = argLabel_Command(cmd, "snap");
+        if (snap) {
+            iWindow *window = get_Window();
+            iInt2 coord = coord_Command(cmd);
+            iInt2 size = init_I2(argLabel_Command(cmd, "width"),
+                                 argLabel_Command(cmd, "height"));
+            SDL_SetWindowPosition(window->win, coord.x, coord.y);
+            SDL_SetWindowSize(window->win, size.x, size.y);
+            window->place.snap = snap;
+            return iTrue;
+        }
+    }
     else if (equal_Command(cmd, "window.restore")) {
         setSnap_Window(get_Window(), none_WindowSnap);
         return iTrue;
@@ -542,6 +555,7 @@ static void setupUserInterface_Window(iWindow *d) {
         const int border = gap_UI / 4;
         setPadding1_Widget(div, border); /* draggable edges */
         iWidget *winBar = new_Widget();
+        setPadding_Widget(winBar, 0, gap_UI / 3, 0, 0);
         setId_Widget(winBar, "winbar");
         setFlags_Widget(winBar,
                         arrangeHeight_WidgetFlag | resizeChildren_WidgetFlag |
@@ -792,13 +806,14 @@ static SDL_HitTestResult hitTest_Window_(SDL_Window *win, const SDL_Point *pos,
     if (SDL_GetWindowFlags(d->win) & (SDL_WINDOW_MOUSE_CAPTURE | SDL_WINDOW_FULLSCREEN_DESKTOP)) {
         return SDL_HITTEST_NORMAL;
     }
+    const int snap = snap_Window(d);
     int w, h;
     SDL_GetWindowSize(win, &w, &h);
     /* TODO: Check if inside the caption label widget. */    
     const iBool isLeft   = pos->x < gap_UI;
     const iBool isRight  = pos->x >= w - gap_UI;
-    const iBool isTop    = pos->y < gap_UI;
-    const iBool isBottom = pos->y >= h - gap_UI;
+    const iBool isTop    = pos->y < gap_UI && snap != yMaximized_WindowSnap;
+    const iBool isBottom = pos->y >= h - gap_UI && snap != yMaximized_WindowSnap;
     const int captionHeight = lineHeight_Text(uiContent_FontId) + gap_UI * 2;
     const int rightEdge = left_Rect(bounds_Widget(findChild_Widget(d->root, "winbar.min")));
     d->place.lastHit = SDL_HITTEST_NORMAL;
@@ -862,6 +877,7 @@ void init_Window(iWindow *d, iRect rect) {
     d->isExposed = iFalse;
     d->isMinimized = iFalse;
     d->isMouseInside = iTrue;
+    d->ignoreClick = iFalse;
     d->focusGainedAt = 0;
     uint32_t flags = 0;
 #if defined (iPlatformAppleDesktop)
@@ -1180,21 +1196,10 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
                    As a workaround, ignore these events. */
                 return iTrue; /* won't go to bindings, either */
             }
-#if 0 //defined (LAGRANGE_CUSTOM_FRAME)
-            if (event.type == SDL_KEYDOWN) {
-                if (keyMods_Sym(event.key.keysym.mod) == KMOD_PRIMARY) {
-                    printf("got! %x\n", event.key.keysym.sym); fflush(stdout);
-                    /* Emulate window snapping keys. */
-                    switch (event.key.keysym.sym) {
-                        default:
-                            break;
-                        case SDLK_LEFT:
-                            setSnap_Window(d, left_WindowSnap);
-                            return iTrue;
-                    }
-                }
+            if (event.type == SDL_MOUSEBUTTONDOWN && d->ignoreClick) {
+                d->ignoreClick = iFalse;
+                return iTrue;
             }
-#endif
             /* Map mouse pointer coordinate to our coordinate system. */
             if (event.type == SDL_MOUSEMOTION) {
                 setCursor_Window(d, SDL_SYSTEM_CURSOR_ARROW); /* default cursor */
diff --git a/src/ui/window.h b/src/ui/window.h
index 6063df88..a914cd43 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -63,6 +63,7 @@ struct Impl_Window {
     iBool         isExposed;
     iBool         isMinimized;
     iBool         isMouseInside;
+    iBool         ignoreClick;
     uint32_t      focusGainedAt;
     SDL_Renderer *render;
     iWidget *     root;
diff --git a/src/win32.c b/src/win32.c
index 8f7bdc02..04080804 100644
--- a/src/win32.c
+++ b/src/win32.c
@@ -153,6 +153,7 @@ void processNativeEvent_Win32(const struct SDL_SysWMmsg *msg, iWindow *window) {
                     break;

                 case SDL_HITTEST_RESIZE_TOP:

                 case SDL_HITTEST_RESIZE_BOTTOM: {

+                    window->ignoreClick = iTrue; /* avoid hitting something inside the window */

                     setSnap_Window(window, yMaximized_WindowSnap);

                     break;

                 }