mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 14:37:46 +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
|
@ -51,24 +51,35 @@ void Menu::set_icon(const Gfx::Bitmap* icon)
|
|||
|
||||
void Menu::add_action(NonnullRefPtr<Action> action)
|
||||
{
|
||||
m_items.append(make<MenuItem>(m_menu_id, move(action)));
|
||||
auto item = make<MenuItem>(m_menu_id, move(action));
|
||||
if (m_menu_id != -1)
|
||||
realize_menu_item(*item, m_items.size());
|
||||
m_items.append(move(item));
|
||||
}
|
||||
|
||||
Menu& Menu::add_submenu(const String& name)
|
||||
{
|
||||
auto submenu = Menu::construct(name);
|
||||
m_items.append(make<MenuItem>(m_menu_id, submenu));
|
||||
|
||||
auto item = make<MenuItem>(m_menu_id, submenu);
|
||||
if (m_menu_id != -1)
|
||||
realize_menu_item(*item, m_items.size());
|
||||
m_items.append(move(item));
|
||||
|
||||
return submenu;
|
||||
}
|
||||
|
||||
void Menu::add_separator()
|
||||
{
|
||||
m_items.append(make<MenuItem>(m_menu_id, MenuItem::Type::Separator));
|
||||
auto item = make<MenuItem>(m_menu_id, MenuItem::Type::Separator);
|
||||
if (m_menu_id != -1)
|
||||
realize_menu_item(*item, m_items.size());
|
||||
m_items.append(move(item));
|
||||
}
|
||||
|
||||
void Menu::realize_if_needed(const RefPtr<Action>& default_action)
|
||||
{
|
||||
if (m_menu_id == -1 || m_last_default_action.ptr() != default_action)
|
||||
if (m_menu_id == -1 || m_current_default_action.ptr() != default_action)
|
||||
realize_menu(default_action);
|
||||
}
|
||||
|
||||
|
@ -94,32 +105,13 @@ int Menu::realize_menu(RefPtr<Action> default_action)
|
|||
|
||||
dbgln_if(MENU_DEBUG, "GUI::Menu::realize_menu(): New menu ID: {}", m_menu_id);
|
||||
VERIFY(m_menu_id > 0);
|
||||
m_current_default_action = default_action;
|
||||
|
||||
for (size_t i = 0; i < m_items.size(); ++i) {
|
||||
auto& item = m_items[i];
|
||||
item.set_menu_id({}, m_menu_id);
|
||||
item.set_identifier({}, i);
|
||||
if (item.type() == MenuItem::Type::Separator) {
|
||||
WindowServerConnection::the().async_add_menu_separator(m_menu_id);
|
||||
continue;
|
||||
}
|
||||
if (item.type() == MenuItem::Type::Submenu) {
|
||||
auto& submenu = *item.submenu();
|
||||
submenu.realize_if_needed(default_action);
|
||||
auto icon = submenu.icon() ? submenu.icon()->to_shareable_bitmap() : Gfx::ShareableBitmap();
|
||||
WindowServerConnection::the().async_add_menu_item(m_menu_id, i, submenu.menu_id(), submenu.name(), true, false, false, false, "", icon, false);
|
||||
continue;
|
||||
}
|
||||
if (item.type() == MenuItem::Type::Action) {
|
||||
auto& action = *item.action();
|
||||
auto shortcut_text = action.shortcut().is_valid() ? action.shortcut().to_string() : String();
|
||||
bool exclusive = action.group() && action.group()->is_exclusive() && action.is_checkable();
|
||||
bool is_default = (default_action.ptr() == &action);
|
||||
auto icon = action.icon() ? action.icon()->to_shareable_bitmap() : Gfx::ShareableBitmap();
|
||||
WindowServerConnection::the().async_add_menu_item(m_menu_id, i, -1, action.text(), action.is_enabled(), action.is_checkable(), action.is_checkable() ? action.is_checked() : false, is_default, shortcut_text, icon, exclusive);
|
||||
}
|
||||
realize_menu_item(m_items[i], i);
|
||||
}
|
||||
|
||||
all_menus().set(m_menu_id, this);
|
||||
m_last_default_action = default_action;
|
||||
return m_menu_id;
|
||||
}
|
||||
|
||||
|
@ -154,4 +146,34 @@ void Menu::visibility_did_change(Badge<WindowServerConnection>, bool visible)
|
|||
on_visibility_change(visible);
|
||||
}
|
||||
|
||||
void Menu::realize_menu_item(MenuItem& item, int item_id)
|
||||
{
|
||||
item.set_menu_id({}, m_menu_id);
|
||||
item.set_identifier({}, item_id);
|
||||
switch (item.type()) {
|
||||
case MenuItem::Type::Separator:
|
||||
WindowServerConnection::the().async_add_menu_separator(m_menu_id);
|
||||
break;
|
||||
case MenuItem::Type::Action: {
|
||||
auto& action = *item.action();
|
||||
auto shortcut_text = action.shortcut().is_valid() ? action.shortcut().to_string() : String();
|
||||
bool exclusive = action.group() && action.group()->is_exclusive() && action.is_checkable();
|
||||
bool is_default = (m_current_default_action.ptr() == &action);
|
||||
auto icon = action.icon() ? action.icon()->to_shareable_bitmap() : Gfx::ShareableBitmap();
|
||||
WindowServerConnection::the().async_add_menu_item(m_menu_id, item_id, -1, action.text(), action.is_enabled(), action.is_checkable(), action.is_checkable() ? action.is_checked() : false, is_default, shortcut_text, icon, exclusive);
|
||||
break;
|
||||
}
|
||||
case MenuItem::Type::Submenu: {
|
||||
auto& submenu = *item.submenu();
|
||||
submenu.realize_if_needed(m_current_default_action.strong_ref());
|
||||
auto icon = submenu.icon() ? submenu.icon()->to_shareable_bitmap() : Gfx::ShareableBitmap();
|
||||
WindowServerConnection::the().async_add_menu_item(m_menu_id, item_id, submenu.menu_id(), submenu.name(), true, false, false, false, "", icon, false);
|
||||
break;
|
||||
}
|
||||
case MenuItem::Type::Invalid:
|
||||
default:
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue