Changeset 39f67f1 in mainline

Timestamp:

2026-02-18T20:21:10Z (32 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

b769ca0

Parents:

26edcd6

Message:

Make maximize/restore work correctly in fullscreen UI.

Location:

uspace/lib/ui

Files:

• private/window.h (modified) (1 diff)
• src/window.c (modified) (8 diffs)

uspace/lib/ui/private/window.h

@@ -82 +82 @@
         /** Display position (if fullscreen mode) */
         gfx_coord2_t dpos;
+        /** Normal display position when not maximized (if fullscreen mode) */
+        gfx_coord2_t normal_dpos;
         /** Application area bitmap */
         gfx_bitmap_t *app_bmp;

uspace/lib/ui/src/window.c

@@ -239 +239 @@
 }
 
+static void ui_window_set_dpos(ui_window_t *window, gfx_coord2_t *dpos)
+{
+        window->dpos = *dpos;
+        if (window->xgc != NULL)
+                xlate_gc_set_off(window->xgc, &window->dpos);
+}
+
 /** Create window's system menu.
  *
@@ -338 +345 @@
         mem_gc_t *memgc = NULL;
         xlate_gc_t *xgc = NULL;
+        gfx_coord2_t dpos;
         errno_t rc;
 
@@ -482 +490 @@
         if (ui->display == NULL) {
                 ui_window_place(window, &ui->rect, &params->rect, &params->prect,
-                    params->placement, &window->dpos);
-
-                if (window->xgc != NULL)
-                        xlate_gc_set_off(window->xgc, &window->dpos);
+                    params->placement, &dpos);
+                ui_window_set_dpos(window, &dpos);
         }
 
@@ -549 +555 @@
 void ui_window_update_placement(ui_window_t *window)
 {
-        if (window->placement != ui_wnd_place_popup)
+        gfx_coord2_t dpos;
+
+        if (window->placement != ui_wnd_place_popup) {
                 ui_window_place(window, &window->ui->rect, &window->rect,
                     NULL, window->placement, &window->dpos);
-
-        if (window->xgc != NULL)
-                xlate_gc_set_off(window->xgc, &window->dpos);
+                ui_window_set_dpos(window, &dpos);
+        }
 
         if (window->placement == ui_wnd_place_full_screen) {
@@ -596 +603 @@
         /* Need to repaint if windows are emulated */
         if (ui_is_fullscreen(ui)) {
-                ui_paint(ui);
+                (void)ui_paint(ui);
                 /* Send focus event to newly active window */
                 nwindow = ui_window_get_active(ui);
@@ -709 +716 @@
         gfx_bitmap_alloc_t app_alloc;
         gfx_bitmap_alloc_t win_alloc;
+        gfx_coord2_t dpos;
         errno_t rc;
 
@@ -784 +792 @@
                         break;
                 }
+        } else {
+                /* fullscreen mode or unit tests */
+                switch (scop) {
+                case ui_wsc_resize:
+                        break;
+                case ui_wsc_maximize:
+                        window->normal_dpos = window->dpos;
+                        dpos.x = 0;
+                        dpos.y = 0;
+                        ui_window_set_dpos(window, &dpos);
+                        break;
+                case ui_wsc_unmaximize:
+                        ui_window_set_dpos(window, &window->normal_dpos);
+                        break;
+                }
         }
 
@@ -822 +845 @@
                 window->app_bmp = app_bmp;
         }
+
+        /* Need to repaint UI if windows are emulated */
+        if (ui_is_fullscreen(window->ui))
+                (void)ui_paint(window->ui);
 
         return EOK;