Changes in uspace/lib/ui/src/window.c [8279aab:ec50d65e] in mainline

File:

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

uspace/lib/ui/src/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -189 +189 @@
         switch (params->placement) {
         case ui_wnd_place_default:
-        case ui_wnd_place_center:
-                assert(params->placement != ui_wnd_place_default ||
-                    ui_is_fullscreen(window->ui));
+                assert(ui_is_fullscreen(window->ui));
                 /* Center window */
                 gfx_rect_dims(&params->rect, &dims);
@@ -345 +343 @@
         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);
 
         /*
@@ -359 +358 @@
         if ((params->flags & ui_wndf_popup) != 0)
                 dparams.flags |= wndf_popup;
-        if ((params->flags & ui_wndf_nofocus) != 0)
-                dparams.flags |= wndf_nofocus;
         if ((params->flags & ui_wndf_topmost) != 0)
                 dparams.flags |= wndf_topmost;
@@ -978 +975 @@
         ui_t *ui = window->ui;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
         ui_window_send_close(window);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }
 
@@ -989 +986 @@
         ui_t *ui = window->ui;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
         (void)nfocus;
 
@@ -998 +995 @@
 
         ui_window_send_focus(window, nfocus);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }
 
@@ -1007 +1004 @@
         ui_t *ui = window->ui;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
         ui_window_send_kbd(window, kbd_event);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }
 
@@ -1023 +1020 @@
                 return;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
 
         claim = ui_wdecor_pos_event(window->wdecor, event);
         if (claim == ui_claimed) {
-                fibril_mutex_unlock(&ui->lock);
+                ui_unlock(ui);
                 return;
         }
 
         ui_window_send_pos(window, event);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }
 
@@ -1048 +1045 @@
                 return;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
         (void) ui_window_resize(window, rect);
-        ui_window_send_resize(window);
-        fibril_mutex_unlock(&ui->lock);
+        (void) ui_window_paint(window);
+        ui_unlock(ui);
 }
 
@@ -1060 +1057 @@
         ui_t *ui = window->ui;
 
-        fibril_mutex_lock(&ui->lock);
+        ui_lock(ui);
 
         if (window->wdecor != NULL && nfocus == 0) {
@@ -1068 +1065 @@
 
         ui_window_send_unfocus(window, nfocus);
-        fibril_mutex_unlock(&ui->lock);
+        ui_unlock(ui);
 }
 
@@ -1298 +1295 @@
 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
@@ -1396 +1393 @@
         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);
 }
 
@@ -1588 +1573 @@
         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);
 }