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

Timestamp:

2020-11-28T23:06:31Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

db3c6795

Parents:

554a5f1

git-author:

Jiri Svoboda <jiri@…> (2020-11-27 22:30:28)

git-committer:

Jiri Svoboda <jiri@…> (2020-11-28 23:06:31)

Message:

Viewer fullsreen mode

Fullscreen window placement is more of a stopgap. Proper
solution would probably be via maximizing the window.

File:

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

uspace/lib/ui/src/window.c

@@ -89 +89 @@
  *
  * Window parameters structure must always be initialized using this function
- * first.
+ * first. By default, the window will be decorated. To get a non-decorated
+ * window, one needs to clear ui_wds_decorated
+ * (e.g. params->style &= ~ui_wds_decorated).
  *
  * @param params Window parameters structure
@@ -96 +98 @@
 {
         memset(params, 0, sizeof(ui_wnd_params_t));
+
+        /* Make window decorated by default. */
+        params->style = ui_wds_decorated;
 }
 
@@ -111 +116 @@
         display_info_t info;
         gfx_coord2_t pos;
+        gfx_coord2_t scr_dims;
         display_wnd_params_t dparams;
         display_window_t *dwindow = NULL;
@@ -129 +135 @@
 
         if (ui->display != NULL) {
+                if (params->placement != ui_wnd_place_default) {
+                        rc = display_get_info(ui->display, &info);
+                        if (rc != EOK)
+                                goto error;
+                }
+
+                if (params->placement == ui_wnd_place_full_screen) {
+                        /* Make window the size of the screen */
+                        gfx_rect_dims(&info.rect, &scr_dims);
+                        gfx_coord2_add(&dparams.rect.p0, &scr_dims,
+                            &dparams.rect.p1);
+                }
+
                 rc = display_window_create(ui->display, &dparams, &dwnd_cb,
                     (void *) window, &dwindow);
@@ -135 +154 @@
 
                 if (params->placement != ui_wnd_place_default) {
-                        rc = display_get_info(ui->display, &info);
-                        if (rc != EOK)
-                                goto error;
-
                         pos.x = 0;
                         pos.y = 0;
@@ -146 +161 @@
                                 assert(false);
                         case ui_wnd_place_top_left:
+                        case ui_wnd_place_full_screen:
                                 pos.x = info.rect.p0.x - params->rect.p0.x;
                                 pos.y = info.rect.p0.y - params->rect.p0.y;
@@ -188 +204 @@
                 goto error;
 
-        ui_wdecor_set_rect(wdecor, &params->rect);
+        ui_wdecor_set_rect(wdecor, &dparams.rect);
         ui_wdecor_set_cb(wdecor, &wdecor_cb, (void *) window);
         ui_wdecor_paint(wdecor);
@@ -194 +210 @@
         window->ui = ui;
         window->dwindow = dwindow;
-        window->rect = params->rect;
+        window->rect = dparams.rect;
         window->gc = gc;
         window->res = res;