Changeset 788c76e3 in mainline

Timestamp:

2023-10-10T19:14:38Z (7 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5d9403d5

Parents:

c0efb2e

Message:

GFX demo should downsize the window with -d cons@ ui

Also do not return task value if the ui is fullscreen.

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (4 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -1109 +1109 @@
         gfx_rect_t wrect;
         gfx_coord2_t off;
+        gfx_rect_t ui_rect;
+        gfx_coord2_t dims;
         errno_t rc;
 
@@ -1114 +1116 @@
         if (rc != EOK) {
                 printf("Error initializing UI (%s)\n", display_spec);
+                goto error;
+        }
+
+        rc = ui_get_rect(ui, &ui_rect);
+        if (rc != EOK) {
+                printf("Error getting display size.\n");
                 goto error;
         }
@@ -1133 +1141 @@
         gfx_rect_rtranslate(&off, &wrect, &params.rect);
 
+        gfx_rect_dims(&ui_rect, &dims);
+
+        /* Make sure window is not larger than the entire screen */
+        if (params.rect.p1.x > dims.x)
+                params.rect.p1.x = dims.x;
+        if (params.rect.p1.y > dims.y)
+                params.rect.p1.y = dims.y;
+
         rc = ui_window_create(ui, &params, &window);
         if (rc != EOK) {
@@ -1147 +1163 @@
         }
 
-        task_retval(0);
-
-        rc = demo_loop(gc, rect.p1.x, rect.p1.y);
+        ui_window_get_app_rect(window, &rect);
+        gfx_rect_dims(&rect, &dims);
+
+        if (!ui_is_fullscreen(ui))
+                task_retval(0);
+
+        rc = demo_loop(gc, dims.x, dims.y);
         if (rc != EOK)
                 goto error;