RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:28:12 +00:00
Code Issues Activity Actions

WindowServer: Add ability to show/hide window menubars

Browse source 
This patch adds a toggle item to the window menu that controls window
menubar visibility. This is available in all windows with a menu.
This commit is contained in:
Andreas Kling 2021-03-28 13:36:34 +02:00
parent ccf84a4709
commit 526b4bbfdb
3 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Services/WindowServer/WindowFrame.cpp
View file

@ -79,7 +79,7 @@ static Gfx::IntRect frame_rect_for_window(Window& window, const Gfx::IntRect& re
{
if (window.is_frameless())
return rect;
int menu_row_count = window.menubar() ? 1 : 0;
int menu_row_count = (window.menubar() && window.should_show_menubar()) ? 1 : 0;
return Gfx::WindowTheme::current().frame_rect_for_window(to_theme_window_type(window.type()), rect, WindowManager::the().palette(), menu_row_count);
}
@ -241,7 +241,7 @@ void WindowFrame::did_set_maximized(Badge<Window>, bool maximized)
Gfx::IntRect WindowFrame::menubar_rect() const
{
if (!m_window.menubar())
if (!m_window.menubar() || !m_window.should_show_menubar())
return {};
return Gfx::WindowTheme::current().menu_bar_rect(to_theme_window_type(m_window.type()), m_window.rect(), WindowManager::the().palette(), menu_row_count());
}
@ -336,7 +336,7 @@ void WindowFrame::paint_normal_frame(Gfx::Painter& painter)
auto leftmost_button_rect = m_buttons.is_empty() ? Gfx::IntRect() : m_buttons.last().relative_rect();
Gfx::WindowTheme::current().paint_normal_frame(painter, window_state_for_theme(), m_window.rect(), compute_title_text(), m_window.icon(), palette, leftmost_button_rect, menu_row_count());
if (m_window.menubar())
if (m_window.menubar() && m_window.should_show_menubar())
paint_menubar(painter);
}
@ -878,6 +878,8 @@ void WindowFrame::paint_simple_rect_shadow(Gfx::Painter& painter, const Gfx::Int
int WindowFrame::menu_row_count() const
{
if (!m_window.should_show_menubar())
return 0;
return m_window.menubar() ? 1 : 0;
}