Changeset 46bd63c9 in mainline for uspace/lib/ui/src/menuentry.c

Timestamp:

2023-09-08T08:47:30Z (9 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1af103e

Parents:

0b6fad9

git-author:

Jiri Svoboda <jiri@…> (2023-09-07 18:47:09)

git-committer:

Jiri Svoboda <jiri@…> (2023-09-08 08:47:30)

Message:

Split drop-down menu into two classes: drop-down and menu

Naming is clearly the hardest problem in computer science.

File:

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

uspace/lib/ui/src/menuentry.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -241 +241 @@
          * 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
+         * is open (and its window is created). Use the parent window's
          * resource instead.
          */
-        res = ui_window_get_res(mentry->menu->mbar->window);
+        res = ui_window_get_res(mentry->menu->parent);
 
         *caption_w = ui_text_width(res->font, mentry->caption);
@@ -267 +267 @@
          * 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
+         * is open (and its window is created). Use the parent window's
          * resource instead.
          */
-        res = ui_window_get_res(menu->mbar->window);
+        res = ui_window_get_res(menu->parent);
 
         if (res->textmode)
@@ -306 +306 @@
          * 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
+         * is open (and its window is created). Use the parent window's
          * resource instead.
          */
-        res = ui_window_get_res(mentry->menu->mbar->window);
+        res = ui_window_get_res(mentry->menu->parent);
 
         if (res->textmode) {
@@ -474 +474 @@
 void ui_menu_entry_activate(ui_menu_entry_t *mentry)
 {
-        /* Deactivate menu bar, close menu */
-        ui_menu_bar_deactivate(mentry->menu->mbar);
+        /* Close menu */
+        ui_menu_close_req(mentry->menu);
 
         /* Call back */