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

Timestamp:

2021-06-10T13:22:33Z (4 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

9e84d2c

Parents:

c68c18b9

git-author:

Jiri Svoboda <jiri@…> (2021-05-27 17:00:30)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-06-10 13:22:33)

Message:

Set menu popup position based on parent window position

Added a method for getting the position of a display window.
This is then combined with the menu bar entry rectangle (which is
relative to the parent window) to compute a screen-relative
rectangle close to which the popup should be placed.

File:

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

uspace/lib/ui/src/window.c

@@ -109 +109 @@
 }
 
+static errno_t ui_window_place(ui_window_t *window, display_t *display,
+    display_info_t *info, ui_wnd_params_t *params)
+{
+        gfx_coord2_t pos;
+        errno_t rc;
+
+        assert(params->placement != ui_wnd_place_default);
+
+        pos.x = 0;
+        pos.y = 0;
+        switch (params->placement) {
+        case ui_wnd_place_default:
+                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;
+                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;
+        case ui_wnd_place_popup:
+                /* Place popup window below parent rectangle */
+                pos.x = params->prect.p0.x;
+                pos.y = params->prect.p1.y;
+                break;
+        }
+
+        rc = display_window_move(window->dwindow, &pos);
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        return rc;
+}
+
 /** Create new window.
  *
@@ -121 +167 @@
         ui_window_t *window;
         display_info_t info;
-        gfx_coord2_t pos;
         gfx_coord2_t scr_dims;
         display_wnd_params_t dparams;
-        display_window_t *dwindow = NULL;
         gfx_context_t *gc = NULL;
         ui_resource_t *res = NULL;
@@ -159 +203 @@
 
                 rc = display_window_create(ui->display, &dparams, &dwnd_cb,
-                    (void *) window, &dwindow);
+                    (void *) window, &window->dwindow);
                 if (rc != EOK)
                         goto error;
 
                 if (params->placement != ui_wnd_place_default) {
-                        pos.x = 0;
-                        pos.y = 0;
-
-                        switch (params->placement) {
-                        case ui_wnd_place_default:
-                                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;
-                                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);
+                        rc = ui_window_place(window, ui->display, &info,
+                            params);
                         if (rc != EOK)
                                 goto error;
                 }
 
-                rc = display_window_get_gc(dwindow, &gc);
+                rc = display_window_get_gc(window->dwindow, &gc);
                 if (rc != EOK)
                         goto error;
@@ -265 +285 @@
 
         window->ui = ui;
-        window->dwindow = dwindow;
         window->rect = dparams.rect;
 
@@ -286 +305 @@
         if (dgc != NULL)
                 dummygc_destroy(dgc);
-        if (dwindow != NULL)
-                display_window_destroy(dwindow);
         free(window);
         return rc;
@@ -536 +553 @@
 {
         return window->gc;
+}
+
+/** Get window position.
+ *
+ * @param window Window
+ * @param pos Place to store position
+ * @return EOK on success or an error code
+ */
+errno_t ui_window_get_pos(ui_window_t *window, gfx_coord2_t *pos)
+{
+        errno_t rc;
+
+        if (window->dwindow != NULL) {
+                rc = display_window_get_pos(window->dwindow, pos);
+                if (rc != EOK)
+                        return rc;
+        } else {
+                pos->x = 0;
+                pos->y = 0;
+        }
+
+        return EOK;
 }