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

Timestamp:

2022-05-19T08:02:31Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ad698f4

Parents:

fd05ea6

git-author:

Jiri Svoboda <jiri@…> (2022-05-18 17:02:12)

git-committer:

Jiri Svoboda <jiri@…> (2022-05-19 08:02:31)

Message:

Maximizing/unmaximizing a window

File:

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

uspace/lib/ui/src/window.c

@@ -74 +74 @@
 };
 
+static void wd_maximize(ui_wdecor_t *, void *);
+static void wd_unmaximize(ui_wdecor_t *, void *);
 static void wd_close(ui_wdecor_t *, void *);
 static void wd_move(ui_wdecor_t *, void *, gfx_coord2_t *);
@@ -81 +83 @@
 
 static ui_wdecor_cb_t wdecor_cb = {
+        .maximize = wd_maximize,
+        .unmaximize = wd_unmaximize,
         .close = wd_close,
         .move = wd_move,
@@ -469 +473 @@
 }
 
-/** Resize/move window.
- *
- * Resize window to the dimensions of @a rect. If @a rect.p0 is not 0,0,
- * the top-left corner of the window will move on the screen accordingly.
+/** Resize or (un)maximize window.
  *
  * @param window Window
  * @param rect Rectangle
+ * @param scop Size change operation
  *
  * @return EOK on success or an error code
  */
-errno_t ui_window_resize(ui_window_t *window, gfx_rect_t *rect)
+errno_t ui_window_size_change(ui_window_t *window, gfx_rect_t *rect,
+    ui_wnd_sc_op_t scop)
 {
         gfx_coord2_t offs;
@@ -545 +548 @@
         }
 
-        /* dwindow can be NULL in case of unit tests */
+        /* dwindow can be NULL in case of unit tests or fullscreen mode */
         if (window->dwindow != NULL) {
-                rc = display_window_resize(window->dwindow, &offs, &nrect);
-                if (rc != EOK)
-                        goto error;
+                switch (scop) {
+                case ui_wsc_resize:
+                        rc = display_window_resize(window->dwindow, &offs,
+                            &nrect);
+                        if (rc != EOK)
+                                goto error;
+                        break;
+                case ui_wsc_maximize:
+                        rc = display_window_maximize(window->dwindow);
+                        if (rc != EOK)
+                                goto error;
+                        break;
+                case ui_wsc_unmaximize:
+                        rc = display_window_unmaximize(window->dwindow);
+                        if (rc != EOK)
+                                goto error;
+                        break;
+                }
         }
 
@@ -597 +615 @@
 }
 
+/** Resize/move window.
+ *
+ * Resize window to the dimensions of @a rect. If @a rect.p0 is not 0,0,
+ * the top-left corner of the window will move on the screen accordingly.
+ *
+ * @param window Window
+ * @param rect Rectangle
+ *
+ * @return EOK on success or an error code
+ */
+errno_t ui_window_resize(ui_window_t *window, gfx_rect_t *rect)
+{
+        return ui_window_size_change(window, rect, ui_wsc_resize);
+}
+
 /** Set window callbacks.
  *
@@ -846 +879 @@
         ui_window_send_unfocus(window);
         ui_unlock(window->ui);
+}
+
+/** Window decoration requested window maximization.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ */
+static void wd_maximize(ui_wdecor_t *wdecor, void *arg)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        ui_window_send_maximize(window);
+}
+
+/** Window decoration requested window unmaximization.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ */
+static void wd_unmaximize(ui_wdecor_t *wdecor, void *arg)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        ui_window_send_unmaximize(window);
 }
 
@@ -948 +1005 @@
 }
 
+/** Send window maximize event.
+ *
+ * @param window Window
+ */
+void ui_window_send_maximize(ui_window_t *window)
+{
+        if (window->cb != NULL && window->cb->maximize != NULL)
+                window->cb->maximize(window, window->arg);
+        else
+                ui_window_def_maximize(window);
+}
+
+/** Send window unmaximize event.
+ *
+ * @param window Window
+ */
+void ui_window_send_unmaximize(ui_window_t *window)
+{
+        if (window->cb != NULL && window->cb->unmaximize != NULL)
+                window->cb->unmaximize(window, window->arg);
+        else
+                ui_window_def_unmaximize(window);
+}
+
 /** Send window close event.
  *
@@ -1014 +1095 @@
         else
                 return ui_window_def_unfocus(window);
+}
+
+/** Default window maximize routine.
+ *
+ * @param window Window
+ * @return EOK on success or an error code
+ */
+errno_t ui_window_def_maximize(ui_window_t *window)
+{
+        errno_t rc;
+        gfx_rect_t old_rect;
+        gfx_rect_t rect;
+
+        old_rect = window->rect;
+
+        if (window->dwindow != NULL) {
+                rc = display_window_get_max_rect(window->dwindow, &rect);
+                if (rc != EOK)
+                        return rc;
+        } else {
+                rect = window->ui->rect;
+        }
+
+        ui_wdecor_set_maximized(window->wdecor, true);
+
+        rc = ui_window_size_change(window, &rect, ui_wsc_maximize);
+        if (rc != EOK) {
+                ui_wdecor_set_maximized(window->wdecor, false);
+                return rc;
+        }
+
+        window->normal_rect = old_rect;
+        (void) ui_window_paint(window);
+        return EOK;
+}
+
+/** Default window unmaximize routine.
+ *
+ * @param window Window
+ * @return EOK on success or an error code
+ */
+errno_t ui_window_def_unmaximize(ui_window_t *window)
+{
+        errno_t rc;
+
+        ui_wdecor_set_maximized(window->wdecor, false);
+
+        rc = ui_window_size_change(window, &window->normal_rect,
+            ui_wsc_unmaximize);
+        if (rc != EOK) {
+                ui_wdecor_set_maximized(window->wdecor, true);
+                printf("ui_window_size_change->error\n");
+                return rc;
+        }
+
+        (void) ui_window_paint(window);
+        return EOK;
 }