Changeset 25f26600 in mainline

Timestamp:

2020-12-07T23:44:20Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

13d20e5, 4db4718d, e9c1639

Parents:

7e38970d

Message:

Resize application GC when resizing window (and app GC is being used)

Location:

uspace/lib/ui

Files:

• include/ui/wdecor.h (modified) (1 diff)
• private/window.h (modified) (2 diffs)
• src/wdecor.c (modified) (1 diff)
• src/window.c (modified) (3 diffs)

uspace/lib/ui/include/ui/wdecor.h

@@ -54 +54 @@
 extern void ui_wdecor_rect_from_app(ui_wdecor_style_t, gfx_rect_t *,
     gfx_rect_t *);
+extern void ui_wdecor_app_from_rect(ui_wdecor_style_t, gfx_rect_t *,
+    gfx_rect_t *);
 
 #endif

uspace/lib/ui/private/window.h

@@ -43 +43 @@
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
+#include <memgfx/memgc.h>
 
 /** Actual structure of window.
@@ -63 +64 @@
         /** Application area bitmap */
         gfx_bitmap_t *app_bmp;
+        /** Application area memory GC */
+        mem_gc_t *app_mgc;
         /** Application area GC */
         gfx_context_t *app_gc;

uspace/lib/ui/src/wdecor.c

@@ -359 +359 @@
 }
 
+/** Application area rectangle from window rectangle.
+ *
+ * Note that this needs to work just based on a UI, without having an actual
+ * window decoration, since we need it in process of resizing the window,
+ * before it is actually resized.
+ *
+ * @param style Decoration style
+ * @param rect Window decoration rectangle
+ * @param app Place to store application area rectangle
+ */
+void ui_wdecor_app_from_rect(ui_wdecor_style_t style, gfx_rect_t *rect,
+    gfx_rect_t *app)
+{
+        *app = *rect;
+
+        if ((style & ui_wds_frame) != 0) {
+                app->p0.x += wdecor_edge_w;
+                app->p0.y += wdecor_edge_h;
+                app->p1.x -= wdecor_edge_w;
+                app->p1.y -= wdecor_edge_h;
+        }
+
+        if ((style & ui_wds_titlebar) != 0)
+                app->p0.y += 22;
+}
+
 /** Get resize type for pointer at the specified position.
  *

uspace/lib/ui/src/window.c

@@ -292 +292 @@
         gfx_coord2_t offs;
         gfx_rect_t nrect;
+        gfx_rect_t arect;
+        gfx_bitmap_t *app_bmp = NULL;
+        gfx_bitmap_params_t params;
+        gfx_bitmap_alloc_t alloc;
         errno_t rc;
 
@@ -301 +305 @@
         gfx_rect_rtranslate(&offs, rect, &nrect);
 
+        if (window->app_gc != NULL) {
+                assert(window->app_bmp != NULL);
+
+                gfx_bitmap_params_init(&params);
+
+                /*
+                 * The bitmap will have the same dimensions as the
+                 * application rectangle, but start at 0,0.
+                 */
+                ui_wdecor_app_from_rect(window->wdecor->style, &nrect, &arect);
+                gfx_rect_rtranslate(&arect.p0, &arect, &params.rect);
+
+                rc = gfx_bitmap_create(window->gc, &params, NULL,
+                    &app_bmp);
+                if (rc != EOK)
+                        goto error;
+
+                rc = gfx_bitmap_get_alloc(app_bmp, &alloc);
+                if (rc != EOK)
+                        goto error;
+        }
+
         /* dwindow can be NULL in case of unit tests */
         if (window->dwindow != NULL) {
                 rc = display_window_resize(window->dwindow, &offs, &nrect);
                 if (rc != EOK)
-                        return rc;
+                        goto error;
         }
 
         ui_wdecor_set_rect(window->wdecor, &nrect);
         ui_wdecor_paint(window->wdecor);
+
+        if (window->app_gc != NULL) {
+                mem_gc_retarget(window->app_mgc, &params.rect, &alloc);
+
+                gfx_bitmap_destroy(window->app_bmp);
+                window->app_bmp = app_bmp;
+        }
+
         return EOK;
+error:
+        if (app_bmp != NULL)
+                gfx_bitmap_destroy(app_bmp);
+        return rc;
 }
 
@@ -389 +427 @@
                 }
 
+                window->app_mgc = memgc;
                 window->app_gc = mem_gc_get_ctx(memgc);
         }