Changeset bfc0fc6 in mainline

Timestamp:

2022-01-11T13:16:22Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b9a30fa

Parents:

5de852c

git-author:

Jiri Svoboda <jiri@…> (2022-01-10 20:16:04)

git-committer:

Jiri Svoboda <jiri@…> (2022-01-11 13:16:22)

Message:

ui_menu_bar_left/right() must not switch to the same menu

If there is a single menu, ui_menu_bar_select() would then close
the current menu, rather than doing nothing. Fixes left/right
behavior in Navigator.

File:

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

uspace/lib/ui/src/menubar.c

@@ -295 +295 @@
                 nmenu = ui_menu_last(mbar);
 
-        ui_menu_bar_select(mbar, nmenu, false);
+        if (nmenu != mbar->selected)
+                ui_menu_bar_select(mbar, nmenu, false);
 }
 
@@ -316 +317 @@
                 nmenu = ui_menu_first(mbar);
 
-        ui_menu_bar_select(mbar, nmenu, false);
+        if (nmenu != mbar->selected)
+                ui_menu_bar_select(mbar, nmenu, false);
 }