Changes in uspace/lib/ui/src/menuentry.c [6a0b2cc:71edd430] in mainline

File:

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

uspace/lib/ui/src/menuentry.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -163 +163 @@
 }
 
-/** Set menu entry disabled flag.
- *
- * @param mentry Menu entry
- * @param disabled @c true iff entry is to be disabled, @c false otherwise
- */
-void ui_menu_entry_set_disabled(ui_menu_entry_t *mentry, bool disabled)
-{
-        mentry->disabled = disabled;
-}
-
-/** Get menu entry disabled flag.
- *
- * @param mentry Menu entry
- * @return disabled @c true iff entry is disabled, @c false otherwise
- */
-bool ui_menu_entry_is_disabled(ui_menu_entry_t *mentry)
-{
-        return mentry->disabled;
-}
-
 /** Get first menu entry in menu.
  *
@@ -261 +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 parent window's
+         * is open (and its window is created). Use the menu bar's
          * resource instead.
          */
-        res = ui_window_get_res(mentry->menu->parent);
+        res = ui_window_get_res(mentry->menu->mbar->window);
 
         *caption_w = ui_text_width(res->font, mentry->caption);
@@ -287 +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 parent window's
+         * is open (and its window is created). Use the menu bar's
          * resource instead.
          */
-        res = ui_window_get_res(menu->parent);
+        res = ui_window_get_res(menu->mbar->window);
 
         if (res->textmode)
@@ -326 +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 parent window's
+         * is open (and its window is created). Use the menu bar's
          * resource instead.
          */
-        res = ui_window_get_res(mentry->menu->parent);
+        res = ui_window_get_res(mentry->menu->mbar->window);
 
         if (res->textmode) {
@@ -392 +372 @@
                 fmt.hgl_color = res->wnd_sel_text_hgl_color;
                 bg_color = res->wnd_sel_text_bg_color;
-        } else if (mentry->disabled) {
-                fmt.color = res->wnd_dis_text_color;
-                fmt.hgl_color = res->wnd_dis_text_color;
-                bg_color = res->wnd_face_color;
         } else {
                 fmt.color = res->wnd_text_color;
@@ -469 +445 @@
                 return;
 
-        if (mentry->separator || mentry->disabled)
+        if (mentry->separator)
                 return;
 
@@ -498 +474 @@
 void ui_menu_entry_activate(ui_menu_entry_t *mentry)
 {
-        /* Close menu */
-        ui_menu_close_req(mentry->menu);
+        /* Deactivate menu bar, close menu */
+        ui_menu_bar_deactivate(mentry->menu->mbar);
 
         /* Call back */