diff options
| author | Andreas Kling <kling@serenityos.org> | 2021-03-31 23:26:32 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-03-31 23:38:26 +0200 |
| commit | ea34ba6fa6a66b53436edefb9c80327660b310f7 (patch) | |
| tree | 4441d87edef6d6331bad3b2071652d18e53451cf /Userland/Services | |
| parent | 0e798234c7cb45012910584215783694433a7cdc (diff) | |
| download | serenity-ea34ba6fa6a66b53436edefb9c80327660b310f7.zip | |
WindowServer+LibGfx: Rename menu_bar => menubar
We had a mix of "menu_bar" and "menubar". Let's just use "menubar"
everywhere since that feels the most natural to write.
Diffstat (limited to 'Userland/Services')
| -rw-r--r-- | Userland/Services/WindowServer/Window.cpp | 2 | ||||
| -rw-r--r-- | Userland/Services/WindowServer/WindowFrame.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Userland/Services/WindowServer/Window.cpp b/Userland/Services/WindowServer/Window.cpp index f0967a4f5d..371aa477ef 100644 --- a/Userland/Services/WindowServer/Window.cpp +++ b/Userland/Services/WindowServer/Window.cpp @@ -971,7 +971,7 @@ void Window::set_menubar(MenuBar* menubar) auto& wm = WindowManager::the(); Gfx::IntPoint next_menu_location { 0, 0 }; - auto menubar_rect = Gfx::WindowTheme::current().menu_bar_rect(Gfx::WindowTheme::WindowType::Normal, rect(), wm.palette(), 1); + auto menubar_rect = Gfx::WindowTheme::current().menubar_rect(Gfx::WindowTheme::WindowType::Normal, rect(), wm.palette(), 1); m_menubar->for_each_menu([&](Menu& menu) { int text_width = wm.font().width(menu.name()); menu.set_rect_in_window_menubar({ next_menu_location.x(), 0, text_width + menubar_menu_margin, menubar_rect.height() }); diff --git a/Userland/Services/WindowServer/WindowFrame.cpp b/Userland/Services/WindowServer/WindowFrame.cpp index a9f10125e8..e40fe4b106 100644 --- a/Userland/Services/WindowServer/WindowFrame.cpp +++ b/Userland/Services/WindowServer/WindowFrame.cpp @@ -240,7 +240,7 @@ Gfx::IntRect WindowFrame::menubar_rect() const { 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()); + return Gfx::WindowTheme::current().menubar_rect(to_theme_window_type(m_window.type()), m_window.rect(), WindowManager::the().palette(), menu_row_count()); } Gfx::IntRect WindowFrame::title_bar_rect() const |