Changeset f2416ec3 in mainline for uspace/lib/ui/src/menuentry.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/menuentry.c (modified) (4 diffs)

uspace/lib/ui/src/menuentry.c

@@ -46 +46 @@
 #include <ui/paint.h>
 #include <ui/menuentry.h>
+#include <ui/window.h>
 #include "../private/menubar.h"
 #include "../private/menuentry.h"
@@ -209 +210 @@
          * resource instead.
          */
-        res = mentry->menu->mbar->res;
+        res = ui_window_get_res(mentry->menu->mbar->window);
 
         *caption_w = gfx_text_width(res->font, mentry->caption);
@@ -235 +236 @@
          * resource instead.
          */
-        res = menu->mbar->res;
+        res = ui_window_get_res(menu->mbar->window);
 
         if (res->textmode)
@@ -274 +275 @@
          * resource instead.
          */
-        res = mentry->menu->mbar->res;
+        res = ui_window_get_res(mentry->menu->mbar->window);
 
         if (res->textmode) {