Changeset a85d5c6 in mainline

Timestamp:

2021-03-16T22:33:16Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7d83c54

Parents:

36795edf

git-author:

Jiri Svoboda <jiri@…> (2021-03-16 22:32:28)

git-committer:

Jiri Svoboda <jiri@…> (2021-03-16 22:33:16)

Message:

Fix window resize when not using window double-buffer

We can only create the direct mapped bitmap after the window has been
resized.

File:

• uspace/lib/ui/src/window.c (modified) (3 diffs)

uspace/lib/ui/src/window.c

@@ -393 +393 @@
         /* mgc != NULL iff client-side rendering */
         if (window->mgc != NULL) {
-                /* Resize window bitmap */
+#ifdef CONFIG_WIN_DOUBLE_BUF
+                /*
+                 * Create new window bitmap in advance. If direct mapping,
+                 * will need do it after resizing the window.
+                 */
                 assert(window->bmp != NULL);
-
                 gfx_bitmap_params_init(&win_params);
-#ifndef CONFIG_WIN_DOUBLE_BUF
-                win_params.flags |= bmpf_direct_output;
-#endif
                 win_params.rect = nrect;
 
@@ -410 +410 @@
                 if (rc != EOK)
                         goto error;
+#endif
         }
 
@@ -443 +444 @@
         }
 
-        /* CLient side rendering? */
+        /* Client side rendering? */
         if (window->mgc != NULL) {
+#ifndef CONFIG_WIN_DOUBLE_BUF
+                /* Window is resized, now we can map the window bitmap again */
+                gfx_bitmap_params_init(&win_params);
+                win_params.flags |= bmpf_direct_output;
+                win_params.rect = nrect;
+
+                rc = gfx_bitmap_create(window->realgc, &win_params, NULL,
+                    &win_bmp);
+                if (rc != EOK)
+                        goto error;
+
+                rc = gfx_bitmap_get_alloc(win_bmp, &win_alloc);
+                if (rc != EOK)
+                        goto error;
+#endif
+
                 mem_gc_retarget(window->mgc, &win_params.rect, &win_alloc);