Changeset 344f8b9 in mainline for uspace/lib/ui/src/menubar.c

Timestamp:

2021-05-20T15:34:03Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Children:

f2416ec3

Parents:

da15002

Message:

Open menu in separate popup window (WIP)

File:

• uspace/lib/ui/src/menubar.c (modified) (8 diffs)

uspace/lib/ui/src/menubar.c

@@ -72 +72 @@
 /** Create new menu bar.
  *
+ * @param ui UI
  * @param res UI resource
  * @param rmbar Place to store pointer to new menu bar
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_menu_bar_create(ui_resource_t *res, ui_menu_bar_t **rmbar)
+errno_t ui_menu_bar_create(ui_t *ui, ui_resource_t *res,
+    ui_menu_bar_t **rmbar)
 {
         ui_menu_bar_t *mbar;
@@ -91 +93 @@
         }
 
+        mbar->ui = ui;
         mbar->res = res;
         list_initialize(&mbar->menus);
@@ -232 +235 @@
  *
  * @param mbar Menu bar
- * @param pos Position (top-left corner) of menu bar entry
+ * @param rect Menu bar entry rectangle
  * @param menu Menu to select (or deselect if selected) or @c NULL
  */
-void ui_menu_bar_select(ui_menu_bar_t *mbar, gfx_coord2_t *pos,
+void ui_menu_bar_select(ui_menu_bar_t *mbar, gfx_rect_t *rect,
     ui_menu_t *menu)
 {
-        gfx_coord2_t spos;
         ui_menu_t *old_menu;
 
@@ -248 +250 @@
                 mbar->selected = NULL;
 
-        /* Need to clear the menu has just been closed */
+        /* Close previously open menu */
         if (old_menu != NULL)
-                (void) ui_menu_unpaint(old_menu);
+                (void) ui_menu_close(old_menu);
 
         (void) ui_menu_bar_paint(mbar);
 
         if (mbar->selected != NULL) {
-                /* Cache position of selected entry */
-                mbar->sel_pos = *pos;
-
-                /* Position menu under selected menu bar entry */
-                spos.x = pos->x;
-                spos.y = mbar->rect.p1.y;
-
-                (void) ui_menu_paint(mbar->selected, &spos);
+                (void) ui_menu_open(mbar->selected, rect);
         }
 }
@@ -275 +270 @@
 {
         gfx_coord2_t pos;
-        gfx_coord2_t spos;
         gfx_rect_t rect;
         ui_menu_t *menu;
@@ -282 +276 @@
         gfx_coord_t hpad;
         gfx_coord2_t ppos;
-        ui_evclaim_t claimed;
 
         ppos.x = event->hpos;
@@ -307 +300 @@
                 if (event->type == POS_PRESS &&
                     gfx_pix_inside_rect(&ppos, &rect)) {
-                        ui_menu_bar_select(mbar, &pos, menu);
+                        ui_menu_bar_select(mbar, &rect, menu);
                         return ui_claimed;
                 }
 
-                if (menu == mbar->selected) {
-                        /* Open menu is positioned below menu bar entry */
-                        spos.x = pos.x;
-                        spos.y = mbar->rect.p1.y;
-
-                        ui_menu_get_rect(menu, &spos, &rect);
-
-                        claimed = ui_menu_pos_event(menu, &spos, event);
-                        if (claimed == ui_claimed)
-                                return ui_claimed;
-                }
-
                 pos.x += width;
                 menu = ui_menu_next(menu);
@@ -336 +317 @@
 void ui_menu_bar_unfocus(ui_menu_bar_t *mbar)
 {
-        ui_menu_bar_select(mbar, NULL, NULL);
+//      ui_menu_bar_select(mbar, NULL, NULL);
 }