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

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/src

Files:

• menu.c (modified) (7 diffs)
• menubar.c (modified) (8 diffs)
• menuentry.c (modified) (6 diffs)
• popup.c (added)
• window.c (modified) (2 diffs)

uspace/lib/ui/src/menu.c

@@ -45 +45 @@
 #include <ui/control.h>
 #include <ui/paint.h>
+#include <ui/popup.h>
 #include <ui/menu.h>
 #include <ui/menuentry.h>
@@ -59 +60 @@
 };
 
+static void ui_menu_popup_pos(ui_popup_t *, void *, pos_event_t *);
+
+static ui_popup_cb_t ui_menu_popup_cb = {
+        .pos = ui_menu_popup_pos
+};
+
 /** Create new menu.
  *
@@ -203 +210 @@
 }
 
+/** Get UI resource from menu.
+ *
+ * @param menu Menu
+ * @return UI resource
+ */
+ui_resource_t *ui_menu_get_res(ui_menu_t *menu)
+{
+        return ui_popup_get_res(menu->popup);
+}
+
+/** Open menu.
+ *
+ * @param menu Menu
+ * @param prect Parent rectangle around which the menu should be placed
+ */
+errno_t ui_menu_open(ui_menu_t *menu, gfx_rect_t *prect)
+{
+        ui_popup_t *popup = NULL;
+        ui_popup_params_t params;
+        ui_menu_geom_t geom;
+        gfx_coord2_t mpos;
+        errno_t rc;
+
+        /* Determine menu dimensions */
+
+        mpos.x = 0;
+        mpos.y = 0;
+        ui_menu_get_geom(menu, &mpos, &geom);
+
+        ui_popup_params_init(&params);
+        params.rect = geom.outer_rect;
+
+        rc = ui_popup_create(menu->mbar->ui, &params, &popup);
+        if (rc != EOK)
+                return rc;
+
+        menu->popup = popup;
+        ui_popup_set_cb(popup, &ui_menu_popup_cb, menu);
+
+        return ui_menu_paint(menu, &mpos);
+}
+
+/** Close menu.
+ *
+ * @param menu Menu
+ */
+void ui_menu_close(ui_menu_t *menu)
+{
+        ui_popup_destroy(menu->popup);
+        menu->popup = NULL;
+}
+
 /** Paint menu.
  *
@@ -218 +277 @@
         errno_t rc;
 
-        res = menu->mbar->res;
+        res = ui_menu_get_res(menu);
         ui_menu_get_geom(menu, spos, &geom);
 
@@ -261 +320 @@
 error:
         return rc;
-}
-
-/** Unpaint menu.
- *
- * @param menu Menu
- * @return EOK on success or an error code
- */
-errno_t ui_menu_unpaint(ui_menu_t *menu)
-{
-        ui_resource_expose(menu->mbar->res);
-        return EOK;
 }
 
@@ -312 +360 @@
         } else {
                 /* Press outside menu - close it */
-                if (event->type == POS_PRESS)
-                        ui_menu_bar_select(menu->mbar, NULL, NULL);
+//              if (event->type == POS_PRESS)
+//                      ui_menu_bar_select(menu->mbar, NULL, NULL);
         }
 
@@ -319 +367 @@
 }
 
+/** Handle position event in menu popup window.
+ *
+ * @param popup Menu popup window
+ * @param arg Argument (ui_menu_t *)
+ * @param event Position event
+ */
+static void ui_menu_popup_pos(ui_popup_t *popup, void *arg, pos_event_t *event)
+{
+        ui_menu_t *menu = (ui_menu_t *)arg;
+        gfx_coord2_t spos;
+
+        spos.x = 0;
+        spos.y = 0;
+        ui_menu_pos_event(menu, &spos, event);
+}
+
 /** @}
  */

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);
 }
 

uspace/lib/ui/src/menuentry.c

@@ -203 +203 @@
         ui_resource_t *res;
 
+        /*
+         * This needs to work even if the menu is not open, so we cannot
+         * use the menu's resource, which is only created after the menu
+         * is open (and its window is created). Use the menu bar's
+         * resource instead.
+         */
         res = mentry->menu->mbar->res;
 
@@ -223 +229 @@
         gfx_coord_t width;
 
+        /*
+         * This needs to work even if the menu is not open, so we cannot
+         * use the menu's resource, which is only created after the menu
+         * is open (and its window is created). Use the menu bar's
+         * resource instead.
+         */
         res = menu->mbar->res;
 
@@ -256 +268 @@
         gfx_coord_t vpad;
 
+        /*
+         * This needs to work even if the menu is not open, so we cannot
+         * use the menu's resource, which is only created after the menu
+         * is open (and its window is created). Use the menu bar's
+         * resource instead.
+         */
         res = mentry->menu->mbar->res;
 
@@ -294 +312 @@
         errno_t rc;
 
-        res = mentry->menu->mbar->res;
+        res = ui_menu_get_res(mentry->menu);
 
         ui_menu_entry_get_geom(mentry, pos, &geom);
@@ -379 +397 @@
         if (mentry->inside) {
                 /* Close menu */
-                ui_menu_bar_select(mentry->menu->mbar,
-                    &mentry->menu->mbar->sel_pos, NULL);
+                ui_menu_bar_select(mentry->menu->mbar, NULL, NULL);
 
                 /* Call back */
@@ -487 +504 @@
         gfx_coord_t width;
 
-        res = mentry->menu->mbar->res;
+        res = ui_menu_get_res(mentry->menu);
 
         if (res->textmode) {

uspace/lib/ui/src/window.c

@@ -336 +336 @@
  * is added, the results are undefined.
  *
- * @param fixed Fixed layout
+ * @param window Window
  * @param control Control
  * @return EOK on success, ENOMEM if out of memory
@@ -509 +509 @@
  *
  * @param window Window
- * @param cb Window decoration callbacks
+ * @param cb Window callbacks
  * @param arg Callback argument
  */