Cleaner window initialization

Create the window using the correct size and position, and don’t show the window contents while app state is being restored.

3 files changed, 33 insertions, 10 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 7e4bdc73..2e53e6ef 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -808,10 +808,10 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
         const enum iGmStatusCode code = status_GmRequest(req->req);
         /* Give the media to the document for presentation. */
         if (code == success_GmStatusCode) {
-            printf("media finished: %s\n  size: %zu\n  type: %s\n",
-                   cstr_String(url_GmRequest(req->req)),
-                   size_Block(body_GmRequest(req->req)),
-                   cstr_String(meta_GmRequest(req->req)));
+//            printf("media finished: %s\n  size: %zu\n  type: %s\n",
+//                   cstr_String(url_GmRequest(req->req)),
+//                   size_Block(body_GmRequest(req->req)),
+//                   cstr_String(meta_GmRequest(req->req)));
             if (startsWith_String(meta_GmRequest(req->req), "image/")) {
                 setImage_GmDocument(d->doc, req->linkId, meta_GmRequest(req->req),
                                     body_GmRequest(req->req));
diff --git a/src/ui/window.c b/src/ui/window.c
index 4f59ef1a..315c4243 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -36,7 +36,7 @@ static float initialUiScale_ = 1.0f;
 static float initialUiScale_ = 1.1f;
 #endif
 
-iDefineTypeConstruction(Window)
+iDefineTypeConstructionArgs(Window, (iRect rect), rect)
 
 static iBool handleRootCommands_(iWidget *root, const char *cmd) {
     iUnused(root);
@@ -354,8 +354,16 @@ static float pixelRatio_Window_(const iWindow *d) {
     return (float) dx / (float) x;
 }
 
-void init_Window(iWindow *d) {
+static void drawBlank_Window_(iWindow *d) {
+    const iColor bg = get_Color(gray25_ColorId);
+    SDL_SetRenderDrawColor(d->render, bg.r, bg.g, bg.b, 255);
+    SDL_RenderClear(d->render);
+    SDL_RenderPresent(d->render);
+}
+
+void init_Window(iWindow *d, iRect rect) {
     theWindow_ = d;
+    d->isBlank = iTrue;
     uint32_t flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
 #if defined (iPlatformApple)
     SDL_SetHint(SDL_HINT_RENDER_DRIVER, "metal");
@@ -363,17 +371,22 @@ void init_Window(iWindow *d) {
     flags |= SDL_WINDOW_OPENGL;
 #endif
     SDL_SetHint(SDL_HINT_RENDER_VSYNC, "1");
-    if (SDL_CreateWindowAndRenderer(800, 500, flags, &d->win, &d->render)) {
+    if (SDL_CreateWindowAndRenderer(
+            width_Rect(rect), height_Rect(rect), flags, &d->win, &d->render)) {
         fprintf(stderr, "Error when creating window: %s\n", SDL_GetError());
         exit(-2);
     }
+    if (left_Rect(rect) >= 0) {
+        SDL_SetWindowPosition(d->win, left_Rect(rect), top_Rect(rect));
+    }
     SDL_SetWindowMinimumSize(d->win, 640, 400);
-    SDL_SetWindowTitle(d->win, "Lagrange");
+    SDL_SetWindowTitle(d->win, "Lagrange");    
     /* Some info. */ {
         SDL_RendererInfo info;
         SDL_GetRendererInfo(d->render, &info);
         printf("[window] renderer: %s\n", info.name);
     }
+    drawBlank_Window_(d);
     d->uiScale = initialUiScale_;
     d->pixelRatio = pixelRatio_Window_(d);
     setPixelRatio_Metrics(d->pixelRatio * d->uiScale);
@@ -447,6 +460,11 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
         }
         default: {
             SDL_Event event = *ev;
+            if (event.type == SDL_USEREVENT && isCommand_UserEvent(ev, "window.unblank")) {
+                d->isBlank = iFalse;
+                postRefresh_App();
+                return iTrue;
+            }
             /* Map mouse pointer coordinate to our coordinate system. */
             if (event.type == SDL_MOUSEMOTION) {
                 const iInt2 pos = coord_Window(d, event.motion.x, event.motion.y);
@@ -479,6 +497,10 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
 
 void draw_Window(iWindow *d) {
     /* Clear the window. */
+    if (d->isBlank) {
+        drawBlank_Window_(d);
+        return;
+    }
     SDL_SetRenderDrawColor(d->render, 0, 0, 0, 255);
     SDL_RenderClear(d->render);
     /* Draw widgets. */
diff --git a/src/ui/window.h b/src/ui/window.h
index 413c454c..6f4e01ce 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -2,16 +2,17 @@
 
 #include "widget.h"
 
-#include <the_Foundation/defs.h>
+#include <the_Foundation/rect.h>
 #include <SDL_events.h>
 #include <SDL_render.h>
 #include <SDL_video.h>
 
 iDeclareType(Window)
-iDeclareTypeConstruction(Window)
+iDeclareTypeConstructionArgs(Window, iRect rect)
 
 struct Impl_Window {
     SDL_Window *  win;
+    iBool         isBlank; /* avoids premature draws while restoring window state */
     SDL_Renderer *render;
     iWidget *     root;
     float         pixelRatio;