Changeset 3c8c580 in mainline for uspace/lib/ui/src/menuentry.c

Timestamp:

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

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

c68c18b9

Parents:

d091007

git-author:

Jiri Svoboda <jiri@…> (2021-05-20 15:34:03)

git-committer:

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

Message:

Open menu in separate popup window (WIP)

File:

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

uspace/lib/ui/src/menuentry.c

@@ -203 +203 @@
         ui_resource_t *res;
 
+        /*
+         * This needs to work even if the menu is not open, so we cannot
+         * use the menu's resource, which is only created after the menu
+         * is open (and its window is created). Use the menu bar's
+         * resource instead.
+         */
         res = mentry->menu->mbar->res;
 
@@ -223 +229 @@
         gfx_coord_t width;
 
+        /*
+         * This needs to work even if the menu is not open, so we cannot
+         * use the menu's resource, which is only created after the menu
+         * is open (and its window is created). Use the menu bar's
+         * resource instead.
+         */
         res = menu->mbar->res;
 
@@ -256 +268 @@
         gfx_coord_t vpad;
 
+        /*
+         * This needs to work even if the menu is not open, so we cannot
+         * use the menu's resource, which is only created after the menu
+         * is open (and its window is created). Use the menu bar's
+         * resource instead.
+         */
         res = mentry->menu->mbar->res;
 
@@ -294 +312 @@
         errno_t rc;
 
-        res = mentry->menu->mbar->res;
+        res = ui_menu_get_res(mentry->menu);
 
         ui_menu_entry_get_geom(mentry, pos, &geom);
@@ -379 +397 @@
         if (mentry->inside) {
                 /* Close menu */
-                ui_menu_bar_select(mentry->menu->mbar,
-                    &mentry->menu->mbar->sel_pos, NULL);
+                ui_menu_bar_select(mentry->menu->mbar, NULL, NULL);
 
                 /* Call back */
@@ -487 +504 @@
         gfx_coord_t width;
 
-        res = mentry->menu->mbar->res;
+        res = ui_menu_get_res(mentry->menu);
 
         if (res->textmode) {