7 files changed, 176 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8b0dd9b..38d36377 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ option (ENABLE_RELATIVE_EMBED   "Resources should always be found via relative p
 option (ENABLE_WINDOWPOS_FIX    "Set position after showing window (workaround for SDL bug)" OFF)
 option (ENABLE_IDLE_SLEEP       "While idle, sleep in the main thread instead of waiting for events" ON)
 option (ENABLE_DOWNLOAD_EDIT    "Allow changing the Downloads directory" ON)
+option (ENABLE_CUSTOM_FRAME     "Draw a custom window frame (Windows)" OFF)
 
 include (BuildType.cmake)
 include (res/Embed.cmake)
@@ -220,6 +221,9 @@ endif ()
 if (ENABLE_DOWNLOAD_EDIT)
     target_compile_definitions (app PUBLIC LAGRANGE_DOWNLOAD_EDIT=1)
 endif ()
+if (ENABLE_CUSTOM_FRAME AND MSYS)
+    target_compile_definitions (app PUBLIC LAGRANGE_CUSTOM_FRAME=1)
+endif ()
 target_link_libraries (app PUBLIC the_Foundation::the_Foundation)
 target_link_libraries (app PUBLIC ${SDL2_LDFLAGS})
 if (APPLE)
@@ -233,7 +237,7 @@ if (APPLE)
         target_link_options (app PUBLIC -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET})
     endif ()
     if (XCODE_DEVELOPMENT_TEAM)
-        set_property (TARGET app PROPERTY 
+        set_property (TARGET app PROPERTY
             XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${XCODE_DEVELOPMENT_TEAM}
         )
     endif ()
diff --git a/src/app.c b/src/app.c
index 90ad271d..b50321b2 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1112,14 +1112,24 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "window.maximize")) {
-        SDL_MaximizeWindow(d->window->win);
+        if (!argLabel_Command(cmd, "toggle")) {
+            SDL_MaximizeWindow(d->window->win);
+        }
+        else {
+            if (SDL_GetWindowFlags(d->window->win) & SDL_WINDOW_MAXIMIZED) {
+                SDL_RestoreWindow(d->window->win);
+            }
+            else {
+                SDL_MaximizeWindow(d->window->win);
+            }
+        }
         return iTrue;
     }
     else if (equal_Command(cmd, "window.fullscreen")) {
-        SDL_SetWindowFullscreen(d->window->win,
-                                SDL_GetWindowFlags(d->window->win) & SDL_WINDOW_FULLSCREEN_DESKTOP
-                                    ? 0
-                                    : SDL_WINDOW_FULLSCREEN_DESKTOP);
+        const iBool wasFull =
+            (SDL_GetWindowFlags(d->window->win) & SDL_WINDOW_FULLSCREEN_DESKTOP) != 0;
+        SDL_SetWindowFullscreen(d->window->win, wasFull ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP);
+        postCommandf_App("window.fullscreen.changed arg:%d", !wasFull);
         return iTrue;
     }
     else if (equal_Command(cmd, "font.set")) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index e35892cf..6ec76c0a 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -633,7 +633,9 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
         iUrl parts;
         init_Url(&parts, d->mod.url);
         if (equalCase_Rangecc(parts.scheme, "about")) {
-            pushBackCStr_StringArray(title, "Lagrange");
+            if (!findWidget_App("winbar")) {
+                pushBackCStr_StringArray(title, "Lagrange");
+            }
         }
         else if (!isEmpty_Range(&parts.host)) {
             pushBackRange_StringArray(title, parts.host);
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 57136509..d7e6c020 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -38,6 +38,7 @@ struct Impl_LabelWidget {
     int     font;
     int     key;
     int     kmods;
+    int     forceFg;
     iString command;
     iBool   alignVisual; /* align according to visible bounds, not typography */
     iClick  click;
@@ -177,6 +178,9 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
         }
         *fg = uiTextPressed_ColorId | permanent_ColorId;
     }
+    if (d->forceFg >= 0) {
+        *fg = d->forceFg;
+    }
 }
 
 static void draw_LabelWidget_(const iLabelWidget *d) {
@@ -277,6 +281,7 @@ void updateSize_LabelWidget(iLabelWidget *d) {
 void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
     init_Widget(&d->widget);
     d->font = uiLabel_FontId;
+    d->forceFg = none_ColorId;
     initCStr_String(&d->label, label);
     if (cmd) {
         initCStr_String(&d->command, cmd);
@@ -304,6 +309,13 @@ void setFont_LabelWidget(iLabelWidget *d, int fontId) {
     updateSize_LabelWidget(d);
 }
 
+void setTextColor_LabelWidget(iLabelWidget *d, int color) {
+    if (d && d->forceFg != color) {
+        d->forceFg = color;
+        refresh_Widget(d);
+    }
+}
+
 void setText_LabelWidget(iLabelWidget *d, const iString *text) {
     updateText_LabelWidget(d, text);
     updateSize_LabelWidget(d);
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index c91793e5..266c3b02 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -31,6 +31,7 @@ iDeclareObjectConstructionArgs(LabelWidget, const char *label, const char *comma
 
 void    setAlignVisually_LabelWidget(iLabelWidget *, iBool alignVisual);
 void    setFont_LabelWidget         (iLabelWidget *, int fontId);
+void    setTextColor_LabelWidget    (iLabelWidget *, int color);
 void    setText_LabelWidget         (iLabelWidget *, const iString *text); /* resizes widget */
 void    setTextCStr_LabelWidget     (iLabelWidget *, const char *text);
 void    setCommand_LabelWidget      (iLabelWidget *, const iString *command);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index ddb3f092..b60c67e3 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -149,6 +149,8 @@ void setPos_Widget(iWidget *d, iInt2 pos) {
 }
 
 void setSize_Widget(iWidget *d, iInt2 size) {
+    if (size.x < 0) size.x = d->rect.size.x;
+    if (size.y < 0) size.y = d->rect.size.y;
     d->rect.size = size;
     setFlags_Widget(d, fixedSize_WidgetFlag, iTrue);
 }
diff --git a/src/ui/window.c b/src/ui/window.c
index 2d65a655..6356b292 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -84,8 +84,32 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
     }
     else if (equal_Command(cmd, "window.focus.lost")) {
         setFocus_Widget(NULL);
+        setTextColor_LabelWidget(findWidget_App("winbar.app"), uiAnnotation_ColorId);
+        setTextColor_LabelWidget(findWidget_App("winbar.title"), uiAnnotation_ColorId);
         return iFalse;
     }
+    else if (equal_Command(cmd, "window.focus.gained")) {
+        setTextColor_LabelWidget(findWidget_App("winbar.app"), uiTextCaution_ColorId);
+        setTextColor_LabelWidget(findWidget_App("winbar.title"), uiTextStrong_ColorId);
+        return iFalse;
+    }
+    else if (equal_Command(cmd, "window.fullscreen.changed")) {
+        iWidget *winBar = findWidget_App("winbar");
+        if (winBar) {
+            setFlags_Widget(winBar, hidden_WidgetFlag, arg_Command(cmd));
+            arrange_Widget(get_Window()->root);
+            postRefresh_App();
+        }
+        return iFalse;
+    }
+    else if (equal_Command(cmd, "window.minimize")) {
+        SDL_MinimizeWindow(get_Window()->win);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "window.close")) {
+        SDL_PushEvent(&(SDL_Event){ .type = SDL_QUIT });
+        return iTrue;
+    }
     else if (handleCommand_App(cmd)) {
         return iTrue;
     }
@@ -503,6 +527,12 @@ static iBool handleSearchBarCommands_(iWidget *searchBar, const char *cmd) {
     return iFalse;
 }
 
+static iLabelWidget *newLargeIcon_LabelWidget(const char *text, const char *cmd) {
+    iLabelWidget *lab = newIcon_LabelWidget(text, 0, 0, cmd);
+    setFont_LabelWidget(lab, uiLabelLarge_FontId);
+    return lab;
+}
+
 static void setupUserInterface_Window(iWindow *d) {
     /* Children of root cover the entire window. */
     setFlags_Widget(d->root, resizeChildren_WidgetFlag, iTrue);
@@ -512,11 +542,58 @@ static void setupUserInterface_Window(iWindow *d) {
     setId_Widget(div, "navdiv");
     addChild_Widget(d->root, iClob(div));
 
+#if defined (LAGRANGE_CUSTOM_FRAME)
+    /* Window title bar. */ {
+        const int border = gap_UI / 4;
+        setPadding1_Widget(div, border); /* draggable edges */
+        iWidget *winBar = new_Widget();
+        setId_Widget(winBar, "winbar");
+        setFlags_Widget(winBar,
+                        arrangeHeight_WidgetFlag | resizeChildren_WidgetFlag |
+                            arrangeHorizontal_WidgetFlag | collapse_WidgetFlag,
+                        iTrue);
+        iLabelWidget *appButton =
+            addChildFlags_Widget(winBar,
+                                 iClob(new_LabelWidget("Lagrange", NULL)),
+                                 fixedHeight_WidgetFlag | frameless_WidgetFlag);
+        setTextColor_LabelWidget(appButton, uiTextCaution_ColorId);
+        setId_Widget(as_Widget(appButton), "winbar.app");
+        iLabelWidget *appTitle;
+        setFont_LabelWidget(appButton, uiContentBold_FontId);
+        setId_Widget(addChildFlags_Widget(winBar,
+                                          iClob(appTitle = new_LabelWidget("", NULL)),
+                                          expand_WidgetFlag | alignLeft_WidgetFlag |
+                                              fixedHeight_WidgetFlag | frameless_WidgetFlag |
+                                              commandOnClick_WidgetFlag),
+                     "winbar.title");
+        setTextColor_LabelWidget(appTitle, uiTextStrong_ColorId);
+        iLabelWidget *appMin, *appMax, *appClose;
+        setId_Widget(addChildFlags_Widget(
+                         winBar,
+                         iClob(appMin = newLargeIcon_LabelWidget("\u2014", "window.minimize")),
+                         frameless_WidgetFlag),
+                     "winbar.min");
+        setSize_Widget(as_Widget(appMin),
+                       init_I2(gap_UI * 11.5f, height_Widget(appTitle)));
+        addChildFlags_Widget(
+            winBar,
+            iClob(appMax = newLargeIcon_LabelWidget("\u25a1", "window.maximize toggle:1")),
+            frameless_WidgetFlag);
+        addChildFlags_Widget(winBar,
+                             iClob(appClose = newLargeIcon_LabelWidget("\u2a2f", "window.close")),
+                             frameless_WidgetFlag);
+        setSize_Widget(as_Widget(appMax), as_Widget(appMin)->rect.size);
+        setSize_Widget(as_Widget(appClose), as_Widget(appMin)->rect.size);
+        addChild_Widget(div, iClob(winBar));
+        setBackgroundColor_Widget(winBar, uiBackground_ColorId);
+    }
+#endif
+
     /* Navigation bar. */ {
         iWidget *navBar = new_Widget();
         setId_Widget(navBar, "navbar");
-        /*setPadding_Widget(navBar, gap_UI / 2, 0, gap_UI / 2, 0);*/
-        setPadding_Widget(navBar, gap_UI, gap_UI / 2, gap_UI, gap_UI / 2);
+        int topPad = !findChild_Widget(div, "winbar") ? gap_UI / 2 : 0;
+        setPadding_Widget(navBar, gap_UI, topPad, gap_UI, gap_UI / 2);
         setFlags_Widget(navBar,
                         arrangeHeight_WidgetFlag | resizeChildren_WidgetFlag |
                             arrangeHorizontal_WidgetFlag,
@@ -697,7 +774,7 @@ static float pixelRatio_Window_(const iWindow *d) {
     SDL_GetDisplayDPI(SDL_GetWindowDisplayIndex(d->win), NULL, NULL, &vdpi);
     const float factor = vdpi / 96.0f;
     return iMax(1.0f, factor);
-#else    
+#else
     int dx, x;
     SDL_GetRendererOutputSize(d->render, &dx, NULL);
     SDL_GetWindowSize(d->win, &x, NULL);
@@ -712,12 +789,61 @@ static void drawBlank_Window_(iWindow *d) {
     SDL_RenderPresent(d->render);
 }
 
+#if defined (LAGRANGE_CUSTOM_FRAME)
+static SDL_HitTestResult hitTest_Window_(SDL_Window *win, const SDL_Point *pos, void *data) {
+    iWindow *d = data;
+    iAssert(d->win == win);
+    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 int captionHeight = lineHeight_Text(uiContent_FontId) + gap_UI * 2;
+    const int rightEdge = left_Rect(bounds_Widget(findChild_Widget(d->root, "winbar.min")));
+    if (isLeft) {
+        return pos->y < captionHeight       ? SDL_HITTEST_RESIZE_TOPLEFT
+               : pos->y > h - captionHeight ? SDL_HITTEST_RESIZE_BOTTOMLEFT
+                                            : SDL_HITTEST_RESIZE_LEFT;
+    }
+    if (isRight) {
+        return pos->y < captionHeight       ? SDL_HITTEST_RESIZE_TOPRIGHT
+               : pos->y > h - captionHeight ? SDL_HITTEST_RESIZE_BOTTOMRIGHT
+                                            : SDL_HITTEST_RESIZE_RIGHT;
+    }
+    if (isTop) {
+        return pos->x < captionHeight       ? SDL_HITTEST_RESIZE_TOPLEFT
+               : pos->x > w - captionHeight ? SDL_HITTEST_RESIZE_TOPRIGHT
+                                            : SDL_HITTEST_RESIZE_TOP;
+    }
+    if (isBottom) {
+        return pos->x < captionHeight       ? SDL_HITTEST_RESIZE_BOTTOMLEFT
+               : pos->x > w - captionHeight ? SDL_HITTEST_RESIZE_BOTTOMRIGHT
+                                            : SDL_HITTEST_RESIZE_BOTTOM;
+    }
+    if (pos->x < rightEdge && pos->y < captionHeight) {
+        return SDL_HITTEST_DRAGGABLE;
+    }
+    return SDL_HITTEST_NORMAL;
+}
+#endif
+
 iBool create_Window_(iWindow *d, iRect rect, uint32_t flags) {
     flags |= SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_HIDDEN;
+#if defined (LAGRANGE_CUSTOM_FRAME)
+    /* We are drawing a custom frame so hide the default one. */
+    flags |= SDL_WINDOW_BORDERLESS;
+#endif
     if (SDL_CreateWindowAndRenderer(
             width_Rect(rect), height_Rect(rect), flags, &d->win, &d->render)) {
         return iFalse;
     }
+#if defined (LAGRANGE_CUSTOM_FRAME)
+    /* Register a handler for window hit testing (drag, resize). */
+    SDL_SetWindowHitTest(d->win, hitTest_Window_, d);    
+    SDL_SetWindowResizable(d->win, SDL_TRUE);
+#endif
     return iTrue;
 }
 
@@ -776,6 +902,9 @@ void init_Window(iWindow *d, iRect rect) {
     d->pixelRatio = pixelRatio_Window_(d);
     setPixelRatio_Metrics(d->pixelRatio * d->uiScale);
 #if defined (iPlatformMsys)
+    SDL_Rect usable;
+    SDL_GetDisplayUsableBounds(0, &usable);
+    SDL_SetWindowMaximumSize(d->win, usable.w, usable.h);
     SDL_SetWindowMinimumSize(d->win, minSize.x * d->pixelRatio, minSize.y * d->pixelRatio);
     useExecutableIconResource_SDLWindow(d->win);
 #endif
@@ -1006,7 +1135,8 @@ void draw_Window(iWindow *d) {
 //    printf("draw %d\n", d->frameTime); fflush(stdout);
 //#endif
     /* Clear the window. */
-    SDL_SetRenderDrawColor(d->render, 0, 0, 0, 255);
+    const iColor back = get_Color(uiSeparator_ColorId);
+    SDL_SetRenderDrawColor(d->render, back.r, back.g, back.b, 255);
     SDL_RenderClear(d->render);
     /* Draw widgets. */
     d->frameTime = SDL_GetTicks();
@@ -1030,6 +1160,10 @@ void resize_Window(iWindow *d, int w, int h) {
 
 void setTitle_Window(iWindow *d, const iString *title) {
     SDL_SetWindowTitle(d->win, cstr_String(title));
+    iLabelWidget *bar = findChild_Widget(d->root, "winbar.title");
+    if (bar) {
+        updateText_LabelWidget(bar, title);
+    }
 }
 
 void setUiScale_Window(iWindow *d, float uiScale) {