Changeset 3c8c580 in mainline for uspace/lib/ui/private

Timestamp:

2021-06-10T13:22:33Z (4 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

c68c18b9

Parents:

d091007

git-author:

Jiri Svoboda <jiri@…> (2021-05-20 15:34:03)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-06-10 13:22:33)

Message:

Open menu in separate popup window (WIP)

Location:

uspace/lib/ui/private

Files:

• menu.h (modified) (3 diffs)
• menubar.h (modified) (2 diffs)
• popup.h (added)

uspace/lib/ui/private/menu.h

@@ -42 +42 @@
 #include <stdbool.h>
 #include <types/ui/menu.h>
+#include <types/ui/resource.h>
 
 /** Actual structure of menu.
@@ -54 +55 @@
         /** Caption */
         char *caption;
-        /** Menu is currently open */
-        bool open;
+        /** Popup window or @c NULL if menu is not currently open */
+        struct ui_popup *popup;
         /** Selected menu entry or @c NULL */
         struct ui_menu_entry *selected;
@@ -80 +81 @@
 
 extern void ui_menu_get_geom(ui_menu_t *, gfx_coord2_t *, ui_menu_geom_t *);
+extern ui_resource_t *ui_menu_get_res(ui_menu_t *);
 
 #endif

uspace/lib/ui/private/menubar.h

@@ -50 +50 @@
         /** Base control object */
         struct ui_control *control;
-        /** UI resource */
+        /** UI */
+        struct ui *ui;
+        /** UI resource (for window containing menu bar) */
         struct ui_resource *res;
         /** Menu bar rectangle */
@@ -56 +58 @@
         /** Selected menu or @c NULL */
         struct ui_menu *selected;
-        /** Position of selected entry */
-        gfx_coord2_t sel_pos;
         /** List of menus (ui_menu_t) */
         list_t menus;
 };
 
-extern void ui_menu_bar_select(ui_menu_bar_t *, gfx_coord2_t *, ui_menu_t *);
+extern void ui_menu_bar_select(ui_menu_bar_t *, gfx_rect_t *, ui_menu_t *);
 
 #endif