Changeset b8b64a8 in mainline for uspace/lib/ui/private

Timestamp:

2021-04-12T15:52:12Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6186f9f

Parents:

d65accb

Message:

Add column with keyboard shortcuts to menu

Location:

uspace/lib/ui/private

Files:

• menu.h (modified) (1 diff)
• menuentry.h (modified) (2 diffs)

uspace/lib/ui/private/menu.h

@@ -58 +58 @@
         /** Selected menu entry or @c NULL */
         struct ui_menu_entry *selected;
-        /** Maximum entry width */
-        gfx_coord_t max_w;
+        /** Maximum caption width */
+        gfx_coord_t max_caption_w;
+        /** Maximum shortcut width */
+        gfx_coord_t max_shortcut_w;
         /** Total entry height */
         gfx_coord_t total_h;

uspace/lib/ui/private/menuentry.h

@@ -61 +61 @@
         /** Caption */
         char *caption;
+        /** Shortcut key(s) */
+        char *shortcut;
 };
 
@@ -70 +72 @@
         /** Outer rectangle */
         gfx_rect_t outer_rect;
-        /** Text position */
-        gfx_coord2_t text_pos;
+        /** Caption position */
+        gfx_coord2_t caption_pos;
+        /** Shortcut position */
+        gfx_coord2_t shortcut_pos;
 } ui_menu_entry_geom_t;