Changeset 06d0c81 in mainline for uspace/lib

Timestamp:

2020-11-19T22:38:17Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

20667af

Parents:

2e0a2e7

Message:

Window placement

Needed to recreate the current 'desktop' and keep CI tests working

Location:

uspace/lib/ui

Files:

• include/types/ui/window.h (modified) (2 diffs)
• src/window.c (modified) (2 diffs)

uspace/lib/ui/include/types/ui/window.h

@@ -44 +44 @@
 typedef struct ui_window ui_window_t;
 
+/** Window placement hint */
+typedef enum {
+        /** Use default (automatic) placement */
+        ui_wnd_place_default = 0,
+        /** Place window to the top-left corner of the screen */
+        ui_wnd_place_top_left,
+        /** Place window to the top-right corner of the screen */
+        ui_wnd_place_top_right,
+        /** Place window to the bottom-left corner of the screen */
+        ui_wnd_place_bottom_left,
+        /** Place window to the bottom-right corner of the screen */
+        ui_wnd_place_bottom_right
+} ui_wnd_placement_t;
+
 /** Window parameters */
 typedef struct {
@@ -50 +64 @@
         /** Window caption */
         const char *caption;
+        /** Window placement */
+        ui_wnd_placement_t placement;
 } ui_wnd_params_t;
 

uspace/lib/ui/src/window.c

@@ -102 +102 @@
 {
         ui_window_t *window;
+        display_info_t info;
+        gfx_coord2_t pos;
         display_wnd_params_t dparams;
         display_window_t *dwindow = NULL;
@@ -122 +124 @@
                 if (rc != EOK)
                         goto error;
+
+                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;
+
+                        switch (params->placement) {
+                        case ui_wnd_place_default:
+                                assert(false);
+                        case ui_wnd_place_top_left:
+                                pos.x = info.rect.p0.x - params->rect.p0.x;
+                                pos.y = info.rect.p0.y - params->rect.p0.y;
+                                break;
+                        case ui_wnd_place_top_right:
+                                pos.x = info.rect.p1.x - params->rect.p1.x;
+                                pos.y = info.rect.p0.y - params->rect.p0.y;
+                                break;
+                        case ui_wnd_place_bottom_left:
+                                pos.x = info.rect.p0.x - params->rect.p0.x;
+                                pos.y = info.rect.p1.y - params->rect.p1.y;
+                                break;
+                        case ui_wnd_place_bottom_right:
+                                pos.x = info.rect.p1.x - params->rect.p1.x;
+                                pos.y = info.rect.p1.y - params->rect.p1.y;
+                                break;
+                        }
+
+                        rc = display_window_move(dwindow, &pos);
+                        if (rc != EOK)
+                                goto error;
+                }
 
                 rc = display_window_get_gc(dwindow, &gc);