Changeset f251883 in mainline

Timestamp:

2021-04-09T22:41:22Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

f536a16

Parents:

62223ec

git-author:

Jiri Svoboda <jiri@…> (2021-04-01 21:31:24)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-04-09 22:41:22)

Message:

Menu entries need to stretch to the width of the menu

Location:

uspace/lib/ui

Files:

• private/menu.h (modified) (1 diff)
• src/menu.c (modified) (2 diffs)
• src/menuentry.c (modified) (4 diffs)

uspace/lib/ui/private/menu.h

@@ -56 +56 @@
         /** Selected menu entry or @c NULL */
         struct ui_menu_entry *selected;
+        /** Maximum entry width */
+        gfx_coord_t max_w;
+        /** Total entry height */
+        gfx_coord_t total_h;
         /** Menu entries (ui_menu_entry_t) */
         list_t entries;

uspace/lib/ui/src/menu.c

@@ -163 +163 @@
     ui_menu_geom_t *geom)
 {
-        ui_menu_entry_t *mentry;
         gfx_coord2_t edim;
         gfx_coord_t frame_w;
         gfx_coord_t frame_h;
-        gfx_coord_t w;
-        gfx_coord_t h;
 
         if (menu->mbar->res->textmode) {
@@ -178 +175 @@
         }
 
-        edim.x = 0;
-        edim.y = 0;
-
-        mentry = ui_menu_entry_first(menu);
-        while (mentry != NULL) {
-                w = ui_menu_entry_width(mentry);
-                h = ui_menu_entry_height(mentry);
-
-                if (w > edim.x)
-                        edim.x = w;
-                edim.y += h;
-
-                mentry = ui_menu_entry_next(mentry);
-        }
+        edim.x = menu->max_w;
+        edim.y = menu->total_h;
 
         geom->outer_rect.p0 = *spos;

uspace/lib/ui/src/menuentry.c

@@ -69 +69 @@
 {
         ui_menu_entry_t *mentry;
+        gfx_coord_t width;
 
         mentry = calloc(1, sizeof(ui_menu_entry_t));
@@ -82 +83 @@
         mentry->menu = menu;
         list_append(&mentry->lentries, &menu->entries);
+
+        /* Update accumulated menu entry dimensions */
+        width = ui_menu_entry_width(mentry);
+        if (width > menu->max_w)
+                menu->max_w = width;
+        menu->total_h += ui_menu_entry_height(mentry);
 
         *rmentry = mentry;
@@ -372 +379 @@
         gfx_coord_t hpad;
         gfx_coord_t vpad;
-        const char *caption;
         gfx_coord_t width;
 
@@ -385 +391 @@
         }
 
-        caption = mentry->caption;
-        width = gfx_text_width(res->font, caption) + 2 * hpad;
+        width = mentry->menu->max_w;
         geom->text_pos.x = pos->x + hpad;
         geom->text_pos.y = pos->y + vpad;