Changeset e54de59 in mainline

Timestamp:

2023-09-29T16:49:53Z (7 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

be0ec50

Parents:

4034954c

Message:

Place menus above parent rectangle if they do not fit below

File:

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

uspace/lib/ui/src/window.c

@@ -178 +178 @@
 {
         gfx_coord2_t dims;
+        gfx_coord2_t below_pos;
+        gfx_rect_t below_rect;
 
         assert(params->placement != ui_wnd_place_default ||
@@ -211 +213 @@
                 break;
         case ui_wnd_place_popup:
-                /* Place popup window below parent rectangle */
-                pos->x = params->prect.p0.x;
-                pos->y = params->prect.p1.y;
+                /* Compute rectangle when placed below */
+                below_pos.x = params->prect.p0.x;
+                below_pos.y = params->prect.p1.y;
+                gfx_rect_translate(&below_pos, &params->rect, &below_rect);
+
+                /* Does below_rect fit within the display? */
+                if (gfx_rect_is_inside(&below_rect, drect)) {
+                        /* Place popup window below parent rectangle */
+                        pos->x = params->prect.p0.x - params->rect.p0.x;
+                        pos->y = params->prect.p1.y - params->rect.p0.y;
+                } else {
+                        /* Place popup window above parent rectangle */
+                        pos->x = params->prect.p0.x;
+                        pos->y = params->prect.p0.y -
+                            (params->rect.p1.y - params->rect.p0.y);
+                }
                 break;
         }