Changeset 5d9403d5 in mainline for uspace/app/taskbar/tbsmenu.c

Timestamp:

2023-10-13T20:27:14Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7aa9fa1b

Parents:

788c76e3

Message:

Open start menu using Enter, fix input device ID

Pressing Enter opens start menu, but only if it is focused.
Need to fix input device ID so that the menu is opened in the
correct seat, both in case of clicking and in case a key is
pressed to open the menu.

File:

• uspace/app/taskbar/tbsmenu.c (modified) (3 diffs)

uspace/app/taskbar/tbsmenu.c

@@ -92 +92 @@
             (void *)tbsmenu);
 
+        ui_pbutton_set_default(tbsmenu->sbutton, true);
+
         rc = ui_fixed_add(fixed, ui_pbutton_ctl(tbsmenu->sbutton));
         if (rc != EOK)
@@ -166 +168 @@
         tbsmenu->rect = *rect;
         ui_pbutton_set_rect(tbsmenu->sbutton, rect);
+}
+
+/** Open taskbar start menu.
+ *
+ * @param tbsmenu Start menu
+ */
+void tbsmenu_open(tbsmenu_t *tbsmenu)
+{
+        (void) ui_menu_open(tbsmenu->smenu, &tbsmenu->rect,
+            tbsmenu->ev_idev_id);
+}
+
+/** Close taskbar start menu.
+ *
+ * @param tbsmenu Start menu
+ */
+void tbsmenu_close(tbsmenu_t *tbsmenu)
+{
+        ui_menu_close(tbsmenu->smenu);
+}
+
+/** Determine if taskbar start menu is open.
+ *
+ * @param tbsmenu Start menu
+ * @return @c true iff start menu is open
+ */
+bool tbsmenu_is_open(tbsmenu_t *tbsmenu)
+{
+        return ui_menu_is_open(tbsmenu->smenu);
 }
 
@@ -352 +383 @@
         tbsmenu_t *tbsmenu = (tbsmenu_t *)arg;
 
-        if (!ui_menu_is_open(tbsmenu->smenu)) {
-                // XXX ev_pos_id is not set!!!
-                (void) ui_menu_open(tbsmenu->smenu, &tbsmenu->rect,
-                    tbsmenu->ev_pos_id);
+        if (!tbsmenu_is_open(tbsmenu)) {
+                tbsmenu_open(tbsmenu);
         } else {
                 /* menu is open */
-                ui_menu_close(tbsmenu->smenu);
+                tbsmenu_close(tbsmenu);
         }
 }