Changeset 56dcf53 in mainline for uspace/lib/gui/window.c

Timestamp:

2020-06-22T17:30:07Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dbf5d7c

Parents:

c8e1f93

Message:

Avoid display artifacts when creating windows

Now the window only becomes noticeable when it's in the right place
and has the right size (it has 1x1 pixels before that). Still,
it first appears black. Ideally we'd only make if visible after
the client has painted the contents.

File:

• uspace/lib/gui/window.c (modified) (6 diffs)

uspace/lib/gui/window.c

@@ -68 +68 @@
 static sysarg_t close_thickness = 20;
 static sysarg_t corner_size = 24;
+static sysarg_t window_initial_size = 1;
 
 static pixel_t color_highlight = PIXEL(255, 255, 255, 255);
@@ -428 +429 @@
         }
 
+        /* Place window, if appropriate */
+        if (placement_flags != WINDOW_PLACEMENT_ANY) {
+                dpos.x = 0;
+                dpos.y = 0;
+
+                rc = display_get_info(win->display, &dinfo);
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&win->guard);
+                        return;
+                }
+
+                drect = dinfo.rect;
+
+                if (placement_flags & WINDOW_PLACEMENT_LEFT)
+                        dpos.x = drect.p0.x;
+                else if (placement_flags & WINDOW_PLACEMENT_CENTER_X)
+                        dpos.x = (drect.p0.x + drect.p1.x - width) / 2;
+                else
+                        dpos.x = drect.p1.x - width;
+
+                if (placement_flags & WINDOW_PLACEMENT_TOP)
+                        dpos.y = drect.p0.y;
+                else if (placement_flags & WINDOW_PLACEMENT_CENTER_Y)
+                        dpos.y = (drect.p0.y + drect.p1.y - height) / 2;
+                else
+                        dpos.y = drect.p1.y - height;
+
+                (void) display_window_move(win->dwindow, &dpos);
+        }
+
         /* Resize the display window. */
         offs.x = offset_x;
@@ -437 +468 @@
 
         rc = display_window_resize(win->dwindow, &offs, &nrect);
-        if (rc != EOK)
-                return;
+        if (rc != EOK) {
+                fibril_mutex_unlock(&win->guard);
+                return;
+        }
 
         gfx_bitmap_params_init(&params);
@@ -493 +526 @@
         surface_reset_damaged_region(win->surface);
         fibril_mutex_unlock(&win->guard);
-
-        if (placement_flags != WINDOW_PLACEMENT_ANY) {
-                dpos.x = 0;
-                dpos.y = 0;
-
-                rc = display_get_info(win->display, &dinfo);
-                if (rc != EOK) {
-                        (void) gfx_bitmap_render(win->bitmap, NULL, NULL);
-                        return;
-                }
-
-                drect = dinfo.rect;
-
-                if (placement_flags & WINDOW_PLACEMENT_LEFT)
-                        dpos.x = drect.p0.x;
-                else if (placement_flags & WINDOW_PLACEMENT_CENTER_X)
-                        dpos.x = (drect.p0.x + drect.p1.x - width) / 2;
-                else
-                        dpos.x = drect.p1.x - width;
-
-                if (placement_flags & WINDOW_PLACEMENT_TOP)
-                        dpos.y = drect.p0.y;
-                else if (placement_flags & WINDOW_PLACEMENT_CENTER_Y)
-                        dpos.y = (drect.p0.y + drect.p1.y - height) / 2;
-                else
-                        dpos.y = drect.p1.y - height;
-
-                (void) display_window_move(win->dwindow, &dpos);
-        }
 
         (void) gfx_bitmap_render(win->bitmap, NULL, NULL);
@@ -688 +692 @@
 
         /* Allocate resources for new surface. */
-        win->surface = surface_create(100, 100, NULL, SURFACE_FLAG_SHARED);
+        win->surface = surface_create( window_initial_size,
+            window_initial_size, NULL, SURFACE_FLAG_SHARED);
         if (win->surface == NULL) {
                 free(win);
@@ -705 +710 @@
         wparams.rect.p0.x = 0;
         wparams.rect.p0.y = 0;
-        wparams.rect.p1.x = 100;
-        wparams.rect.p1.y = 100;
+        wparams.rect.p1.x = window_initial_size;
+        wparams.rect.p1.y = window_initial_size;
         wparams.min_size.x = 2 * border_thickness + header_min_width;
         wparams.min_size.y = 2 * border_thickness + header_height;