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

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

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

uspace/lib/ui/src/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -318 +318 @@
 {
         ui_window_t *window;
+        ui_window_t *pwindow = NULL;
         display_info_t info;
         gfx_coord2_t scr_dims;
@@ -342 +343 @@
         dparams.rect = params->rect;
         dparams.caption = params->caption;
-        /* Only allow making the window larger */
-        gfx_rect_dims(&params->rect, &dparams.min_size);
+        dparams.min_size = params->min_size;
 
         /*
@@ -505 +505 @@
         *rwindow = window;
 
+        if (ui_is_fullscreen(ui))
+                pwindow = ui_window_get_active(ui);
+
         list_append(&window->lwindows, &ui->windows);
+
+        if (ui_is_fullscreen(ui)) {
+                /* Send unfocus event to previously active window */
+                if (pwindow != NULL)
+                        ui_window_send_unfocus(pwindow, 0);
+        }
+
         return EOK;
 error:
@@ -531 +541 @@
 {
         ui_t *ui;
+        ui_window_t *nwindow;
 
         if (window == NULL)
@@ -558 +569 @@
         if (ui_is_fullscreen(ui)) {
                 ui_paint(ui);
+                /* Send focus event to newly active window */
+                nwindow = ui_window_get_active(ui);
+                if (nwindow != NULL)
+                        ui_window_send_focus(nwindow, 0);
         }
 
@@ -1031 +1046 @@
         ui_lock(ui);
         (void) ui_window_resize(window, rect);
-        (void) ui_window_paint(window);
+        ui_window_send_resize(window);
         ui_unlock(ui);
 }
@@ -1279 +1294 @@
 void ui_window_send_minimize(ui_window_t *window)
 {
-        if (window->cb != NULL && window->cb->maximize != NULL)
+        if (window->cb != NULL && window->cb->minimize != NULL)
                 window->cb->minimize(window, window->arg);
         else
@@ -1377 +1392 @@
         else
                 return ui_window_def_unfocus(window, nfocus);
+}
+
+/** Send window resize event.
+ *
+ * @param window Window
+ */
+void ui_window_send_resize(ui_window_t *window)
+{
+        if (window->cb != NULL && window->cb->resize != NULL)
+                window->cb->resize(window, window->arg);
+        else
+                return ui_window_def_resize(window);
 }
 
@@ -1557 +1584 @@
         if (window->control != NULL)
                 ui_control_unfocus(window->control, nfocus);
+}
+
+/** Default window resize routine.
+ *
+ * @param window Window
+ * @return EOK on success or an error code
+ */
+void ui_window_def_resize(ui_window_t *window)
+{
+        ui_window_paint(window);
 }