Changes in uspace/lib/ui/src/window.c [06176e1:0415776] in mainline

File:

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

uspace/lib/ui/src/window.c

@@ -74 +74 @@
 };
 
-static void wd_minimize(ui_wdecor_t *, void *);
 static void wd_maximize(ui_wdecor_t *, void *);
 static void wd_unmaximize(ui_wdecor_t *, void *);
@@ -84 +83 @@
 
 static ui_wdecor_cb_t wdecor_cb = {
-        .minimize = wd_minimize,
         .maximize = wd_maximize,
         .unmaximize = wd_unmaximize,
@@ -224 +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);
@@ -230 +227 @@
         if ((params->flags & ui_wndf_popup) != 0)
                 dparams.flags |= wndf_popup;
-        if ((params->flags & ui_wndf_topmost) != 0)
-                dparams.flags |= wndf_topmost;
-        if ((params->flags & ui_wndf_system) != 0)
-                dparams.flags |= wndf_system;
-        if ((params->flags & ui_wndf_avoid) != 0)
-                dparams.flags |= wndf_avoid;
 
         if (ui->display != NULL) {
@@ -660 +651 @@
 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);
 }
@@ -917 +891 @@
         ui_window_send_unfocus(window);
         ui_unlock(ui);
-}
-
-/** Window decoration requested window minimization.
- *
- * @param wdecor Window decoration
- * @param arg Argument (window)
- */
-static void wd_minimize(ui_wdecor_t *wdecor, void *arg)
-{
-        ui_window_t *window = (ui_window_t *) arg;
-
-        ui_window_send_minimize(window);
 }
 
@@ -1055 +1017 @@
 }
 
-/** Send window minimize event.
- *
- * @param window Window
- */
-void ui_window_send_minimize(ui_window_t *window)
-{
-        if (window->cb != NULL && window->cb->maximize != NULL)
-                window->cb->minimize(window, window->arg);
-        else
-                ui_window_def_minimize(window);
-}
-
 /** Send window maximize event.
  *
@@ -1157 +1107 @@
         else
                 return ui_window_def_unfocus(window);
-}
-
-/** Default window minimize routine.
- *
- * @param window Window
- * @return EOK on success or an error code
- */
-errno_t ui_window_def_minimize(ui_window_t *window)
-{
-        errno_t rc;
-
-        if (window->dwindow != NULL) {
-                rc = display_window_minimize(window->dwindow);
-                if (rc != EOK)
-                        goto error;
-        }
-
-        return EOK;
-error:
-        return rc;
 }