Changeset 3e41cc4 in mainline for uspace/lib/ui

Timestamp:

2025-10-19T13:08:37Z (8 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

5bf9ca21, aefdccd, c81ab84, e6b4d2d, fa655ae0

Parents:

bb4d0b5

Message:

Repaint all windows in fullscreen mode in ui_paint().

After error dialog is closed in Navigator, need to also repaint main window,
not just progress window.

Location:

uspace/lib/ui

Files:

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

uspace/lib/ui/include/ui/window.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -56 +56 @@
 extern void ui_window_add(ui_window_t *, ui_control_t *);
 extern void ui_window_remove(ui_window_t *, ui_control_t *);
-extern ui_window_t *ui_window_get_active(ui_t *);
 extern errno_t ui_window_resize(ui_window_t *, gfx_rect_t *);
 extern ui_t *ui_window_get_ui(ui_window_t *);

uspace/lib/ui/private/window.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -136 +136 @@
 extern errno_t ui_window_size_change(ui_window_t *, gfx_rect_t *,
     ui_wnd_sc_op_t);
+extern ui_window_t *ui_window_get_active(ui_t *);
+extern ui_window_t *ui_window_first(ui_t *);
+extern ui_window_t *ui_window_next(ui_window_t *);
 
 #endif

uspace/lib/ui/src/ui.c

@@ -412 +412 @@
         errno_t rc;
         gfx_context_t *gc;
-        ui_window_t *awnd;
+        ui_window_t *wnd;
         gfx_color_t *color = NULL;
 
@@ -439 +439 @@
         gfx_color_delete(color);
 
-        /* XXX Should repaint all windows */
-        awnd = ui_window_get_active(ui);
-        if (awnd == NULL)
-                return EOK;
-
-        rc = ui_wdecor_paint(awnd->wdecor);
-        if (rc != EOK)
-                return rc;
-
-        return ui_window_paint(awnd);
+        /* Repaint all windows */
+        wnd = ui_window_first(ui);
+        while (wnd != NULL) {
+                rc = ui_wdecor_paint(wnd->wdecor);
+                if (rc != EOK)
+                        return rc;
+
+                rc = ui_window_paint(wnd);
+                if (rc != EOK)
+                        return rc;
+
+                wnd = ui_window_next(wnd);
+        }
+
+        return EOK;
 }
 

uspace/lib/ui/src/window.c

@@ -617 +617 @@
 }
 
+/** Get first (lowermost) window (only valid in fullscreen mode).
+ *
+ * @param ui User interface
+ * @return First window
+ */
+ui_window_t *ui_window_first(ui_t *ui)
+{
+        link_t *link;
+
+        link = list_first(&ui->windows);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ui_window_t, lwindows);
+}
+
+/** Get next window (only valid in fullscreen mode).
+ *
+ * @param cur Current window
+ * @return First window
+ */
+ui_window_t *ui_window_next(ui_window_t *cur)
+{
+        link_t *link;
+
+        link = list_next(&cur->lwindows, &cur->ui->windows);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ui_window_t, lwindows);
+}
+
 /** Get active window (only valid in fullscreen mode).
  *