Changeset f2416ec3 in mainline for uspace/lib/ui/src/menu.c

Timestamp:

2021-05-26T07:40:59Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Children:

6baab83

Parents:

344f8b9

git-author:

Jiri Svoboda <jiri@…> (2021-05-25 18:40:50)

git-committer:

Jiri Svoboda <jiri@…> (2021-05-26 07:40:59)

Message:

Specify parent window when creating popup

This will be used in conjunction with ui_wnd_popup_params_t.place
(a rectangle relative to the parent window) to determine where on
the screen the popup window should appear.

File:

• uspace/lib/ui/src/menu.c (modified) (3 diffs)

uspace/lib/ui/src/menu.c

@@ -49 +49 @@
 #include <ui/menuentry.h>
 #include <ui/resource.h>
+#include <ui/window.h>
 #include "../private/menubar.h"
 #include "../private/menu.h"
@@ -170 +171 @@
     ui_menu_geom_t *geom)
 {
+        ui_resource_t *res;
         gfx_coord2_t edim;
         gfx_coord_t frame_w;
         gfx_coord_t frame_h;
 
-        if (menu->mbar->res->textmode) {
+        res = ui_window_get_res(menu->mbar->window);
+
+        if (res->textmode) {
                 frame_w = menu_frame_w_text;
                 frame_h = menu_frame_h_text;
@@ -242 +246 @@
         params.rect = geom.outer_rect;
 
-        rc = ui_popup_create(menu->mbar->ui, &params, &popup);
+        rc = ui_popup_create(menu->mbar->ui, menu->mbar->window, &params,
+            &popup);
         if (rc != EOK)
                 return rc;