Changes in uspace/lib/ui/src/window.c [9aa51406:29ed06d] in mainline

File:

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

uspace/lib/ui/src/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2023 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;
@@ -343 +342 @@
         dparams.rect = params->rect;
         dparams.caption = params->caption;
-        dparams.min_size = params->min_size;
+        /* Only allow making the window larger */
+        gfx_rect_dims(&params->rect, &dparams.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:
@@ -541 +531 @@
 {
         ui_t *ui;
-        ui_window_t *nwindow;
 
         if (window == NULL)
@@ -569 +558 @@
         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);
         }
 
@@ -1046 +1031 @@
         ui_lock(ui);
         (void) ui_window_resize(window, rect);
-        ui_window_send_resize(window);
+        (void) ui_window_paint(window);
         ui_unlock(ui);
 }
@@ -1294 +1279 @@
 void ui_window_send_minimize(ui_window_t *window)
 {
-        if (window->cb != NULL && window->cb->minimize != NULL)
+        if (window->cb != NULL && window->cb->maximize != NULL)
                 window->cb->minimize(window, window->arg);
         else
@@ -1392 +1377 @@
         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);
 }
 
@@ -1584 +1557 @@
         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);
 }