Changeset 266ec54 in mainline for uspace/app/viewer/viewer.c

Timestamp:

2020-11-28T23:06:31Z (3 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/app/viewer/viewer.c (modified) (5 diffs)

uspace/app/viewer/viewer.c

@@ -181 +181 @@
 
         ui_window_get_app_rect(window, &arect);
-        gfx_rect_translate(&arect.p0, rect, &irect);
+
+        /* Center image on application area */
+        gfx_rect_ctr_on_rect(rect, &arect, &irect);
 
         if (image != NULL) {
@@ -239 +241 @@
                         display_spec = argv[i++];
                 } else if (str_cmp(argv[i], "-f") == 0) {
+                        ++i;
                         fullscreen = true;
                 } else {
@@ -266 +269 @@
                         return 3;
                 }
-        }
-
-        // TODO Fullscreen mode
-        if (fullscreen) {
-                printf("Fullscreen mode not implemented.\n");
-                return 1;
         }
 
@@ -293 +290 @@
         params.rect.p1.y = 1;
 
+        if (fullscreen) {
+                params.style &= ~ui_wds_decorated;
+                params.placement = ui_wnd_place_full_screen;
+        }
+
         rc = ui_window_create(ui, &params, &window);
         if (rc != EOK) {
@@ -312 +314 @@
          * to rect
          */
-        ui_wdecor_rect_from_app(&lrect, &wrect);
+        ui_wdecor_rect_from_app(params.style, &lrect, &wrect);
         off = wrect.p0;
         gfx_rect_rtranslate(&off, &wrect, &rect);
-        rc = ui_window_resize(window, &rect);
-        if (rc != EOK) {
-                printf("Error resizing window.\n");
-                return 1;
+
+        if (!fullscreen) {
+                rc = ui_window_resize(window, &rect);
+                if (rc != EOK) {
+                        printf("Error resizing window.\n");
+                        return 1;
+                }
         }