mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 18:57:45 +00:00
LibGUI, WindowServer: Greatly simplify menubar logic
Currently, any number of menubars can be plugged in and out of a window. This is unnecessary complexity, since we only need one menubar on a window. This commit removes most of the logic for dynamically attaching and detaching menubars and makes one menubar always available. The menubar is only considered existent if it has at least a single menu in it (in other words, an empty menubar will not be shown). This commit additionally fixes a bug wherein menus added after a menubar has been attached would not have their rects properly setup, and would therefore appear glitched out on the top left corner of the menubar.
This commit is contained in:
parent
95ab61e3db
commit
611370e7dc
19 changed files with 150 additions and 255 deletions
|
@ -362,7 +362,7 @@ Menu* MenuManager::previous_menu(Menu* current)
|
|||
return nullptr;
|
||||
Menu* found = nullptr;
|
||||
Menu* previous = nullptr;
|
||||
wm.window_with_active_menu()->menubar()->for_each_menu([&](Menu& menu) {
|
||||
wm.window_with_active_menu()->menubar().for_each_menu([&](Menu& menu) {
|
||||
if (current == &menu) {
|
||||
found = previous;
|
||||
return IterationDecision::Break;
|
||||
|
@ -380,7 +380,7 @@ Menu* MenuManager::next_menu(Menu* current)
|
|||
auto& wm = WindowManager::the();
|
||||
if (!wm.window_with_active_menu())
|
||||
return nullptr;
|
||||
wm.window_with_active_menu()->menubar()->for_each_menu([&](Menu& menu) {
|
||||
wm.window_with_active_menu()->menubar().for_each_menu([&](Menu& menu) {
|
||||
if (is_next) {
|
||||
found = &menu;
|
||||
return IterationDecision::Break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue