Changeset 6aa85c1 in mainline for uspace/app/nav/menu.c

Timestamp:

2021-10-25T00:32:45Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

b36ebb42

Parents:

5d466a1

git-author:

Jiri Svoboda <jiri@…> (2021-10-03 17:39:36)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

Add panel class and add unit tests for all classes

File:

• uspace/app/nav/menu.c (modified) (5 diffs)

uspace/app/nav/menu.c

@@ -47 +47 @@
 /** Create navigator menu.
  *
- * @param navigator Navigator
+ * @param window Navigator window
  * @param rmenu Place to store pointer to new menu
  * @return EOK on success or an error code
  */
-errno_t nav_menu_create(navigator_t *navigator, nav_menu_t **rmenu)
+errno_t nav_menu_create(ui_window_t *window, nav_menu_t **rmenu)
 {
         nav_menu_t *menu;
@@ -64 +64 @@
                 return ENOMEM;
 
-        rc = ui_menu_bar_create(navigator->ui, navigator->window,
+        menu->window = window;
+        menu->ui = ui_window_get_ui(window);
+
+        rc = ui_menu_bar_create(menu->ui, menu->window,
             &menu->menubar);
         if (rc != EOK)
@@ -77 +80 @@
                 goto error;
 
-        ui_menu_entry_set_cb(mexit, nav_file_exit, (void *) navigator);
+        ui_menu_entry_set_cb(mexit, nav_file_exit, (void *) menu);
 
-        ui_window_get_app_rect(navigator->window, &arect);
+        ui_window_get_app_rect(menu->window, &arect);
 
         rect.p0 = arect.p0;
@@ -86 +89 @@
         ui_menu_bar_set_rect(menu->menubar, &rect);
 
-        rc = ui_fixed_add(navigator->fixed, ui_menu_bar_ctl(menu->menubar));
-        if (rc != EOK)
-                goto error;
-
-        menu->navigator = navigator;
         *rmenu = menu;
         return EOK;
@@ -104 +102 @@
 void nav_menu_destroy(nav_menu_t *menu)
 {
-        if (menu->menubar != NULL) {
-                ui_fixed_remove(menu->navigator->fixed,
-                    ui_menu_bar_ctl(menu->menubar));
+        if (menu->menubar != NULL)
                 ui_menu_bar_destroy(menu->menubar);
-        }
 
         free(menu);
+}
+
+/** Return base UI control for the menu bar.
+ *
+ * @param menu Navigator menu
+ * @return UI control
+ */
+ui_control_t *nav_menu_ctl(nav_menu_t *menu)
+{
+        return ui_menu_bar_ctl(menu->menubar);
 }