Changeset 7cc30e9 in mainline for uspace/lib/ui/src/window.c

Timestamp:

2022-10-24T17:50:46Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

913add60

Parents:

7a05d924

Message:

Display server needs to store window caption

Even though it does not use it itself, it needs to provide it to
window managers (e.g. Task bar). We need to be able to set caption
for a new window and to change it for an existing window.

File:

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

uspace/lib/ui/src/window.c

@@ -222 +222 @@
         display_wnd_params_init(&dparams);
         dparams.rect = params->rect;
+        dparams.caption = params->caption;
         /* Only allow making the window larger */
         gfx_rect_dims(&params->rect, &dparams.min_size);
@@ -651 +652 @@
 errno_t ui_window_set_caption(ui_window_t *window, const char *caption)
 {
+        errno_t rc;
+
+        /* Set console caption if fullscreen window on console */
+        if (window->ui->console != NULL && window->placement ==
+            ui_wnd_place_full_screen) {
+                rc = console_set_caption(window->ui->console, caption);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        /* Set display window caption if running on display service */
+        if (window->dwindow != NULL) {
+                rc = display_window_set_caption(window->dwindow, caption);
+                if (rc != EOK)
+                        return rc;
+        }
+
         return ui_wdecor_set_caption(window->wdecor, caption);
 }