mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 14:37: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
|
@ -1,27 +1,26 @@
|
|||
/*
|
||||
* Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
|
||||
* Copyright (c) 2021, sin-ack <sin-ack@protonmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include "Menubar.h"
|
||||
#include "Menu.h"
|
||||
#include "WindowManager.h"
|
||||
|
||||
namespace WindowServer {
|
||||
|
||||
Menubar::Menubar(ClientConnection& client, int menubar_id)
|
||||
: m_client(client)
|
||||
, m_menubar_id(menubar_id)
|
||||
void Menubar::layout_menu(Menu& menu, Gfx::IntRect window_rect)
|
||||
{
|
||||
}
|
||||
// FIXME: Maybe move this to the theming system?
|
||||
static constexpr auto menubar_menu_margin = 14;
|
||||
|
||||
Menubar::~Menubar()
|
||||
{
|
||||
}
|
||||
auto& wm = WindowManager::the();
|
||||
auto menubar_rect = Gfx::WindowTheme::current().menubar_rect(Gfx::WindowTheme::WindowType::Normal, window_rect, wm.palette(), 1);
|
||||
|
||||
void Menubar::add_menu(Menu& menu)
|
||||
{
|
||||
m_menus.append(menu);
|
||||
int text_width = wm.font().width(Gfx::parse_ampersand_string(menu.name()));
|
||||
menu.set_rect_in_window_menubar({ m_next_menu_location.x(), 0, text_width + menubar_menu_margin, menubar_rect.height() });
|
||||
m_next_menu_location.translate_by(menu.rect_in_window_menubar().width(), 0);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue