diff --git a/Servers/WindowServer/MenuManager.cpp b/Servers/WindowServer/MenuManager.cpp index ba0e4288b2..1e171ee0b9 100644 --- a/Servers/WindowServer/MenuManager.cpp +++ b/Servers/WindowServer/MenuManager.cpp @@ -198,6 +198,16 @@ bool MenuManager::is_open(const Menu& menu) const return false; } +const Gfx::Font& MenuManager::menu_font() const +{ + return Gfx::Font::default_font(); +} + +const Gfx::Font& MenuManager::app_menu_font() const +{ + return Gfx::Font::default_bold_font(); +} + void MenuManager::draw() { auto& wm = WindowManager::the(); @@ -246,7 +256,7 @@ void MenuManager::draw() painter.draw_text( menu.text_rect_in_menubar(), menu.name(), - index == 1 ? wm.app_menu_font() : wm.menu_font(), + index == 1 ? app_menu_font() : menu_font(), Gfx::TextAlignment::CenterLeft, text_color); ++index; diff --git a/Servers/WindowServer/MenuManager.h b/Servers/WindowServer/MenuManager.h index 07fb8eca09..a7253ba3c1 100644 --- a/Servers/WindowServer/MenuManager.h +++ b/Servers/WindowServer/MenuManager.h @@ -90,6 +90,9 @@ public: } private: + const Gfx::Font& menu_font() const; + const Gfx::Font& app_menu_font() const; + void close_menus(const Vector&); Window& window() { return *m_window; } diff --git a/Servers/WindowServer/WindowManager.cpp b/Servers/WindowServer/WindowManager.cpp index 8f91bb9028..7ed0204aa1 100644 --- a/Servers/WindowServer/WindowManager.cpp +++ b/Servers/WindowServer/WindowManager.cpp @@ -130,16 +130,6 @@ const Gfx::Font& WindowManager::window_title_font() const return Gfx::Font::default_bold_font(); } -const Gfx::Font& WindowManager::menu_font() const -{ - return Gfx::Font::default_font(); -} - -const Gfx::Font& WindowManager::app_menu_font() const -{ - return Gfx::Font::default_bold_font(); -} - void WindowManager::set_resolution(int width, int height) { Compositor::the().set_resolution(width, height); diff --git a/Servers/WindowServer/WindowManager.h b/Servers/WindowServer/WindowManager.h index c745e93128..e40a008a2d 100644 --- a/Servers/WindowServer/WindowManager.h +++ b/Servers/WindowServer/WindowManager.h @@ -142,10 +142,6 @@ public: const Gfx::Font& font() const; const Gfx::Font& window_title_font() const; - const Gfx::Font& menu_font() const; - const Gfx::Font& app_menu_font() const; - - int menubar_menu_margin() const; void set_resolution(int width, int height);