Changeset f251883 in mainline for uspace/lib/ui/src/menu.c

Timestamp:

2021-04-09T22:41:22Z (4 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

File:

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

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;