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

File:

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

uspace/lib/ui/src/menuentry.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -145 +145 @@
                 return;
 
+        mentry->menu->total_h -= ui_menu_entry_height(mentry);
+        /* NOTE: max_caption_w/max_shortcut_w not updated (speed) */
+
         list_remove(&mentry->lentries);
+
+        /*
+         * If we emptied the menu, reset accumulated dims so they
+         * can be correctly calculated when (if) the menu is
+         * re-populated.
+         */
+        if (list_empty(&mentry->menu->entries)) {
+                mentry->menu->total_h = 0;
+                mentry->menu->max_caption_w = 0;
+                mentry->menu->max_shortcut_w = 0;
+        }
+
         free(mentry->caption);
         free(mentry);