diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp index 851ba3889c..7b5d52378d 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.cpp +++ b/Userland/Services/Taskbar/TaskbarWindow.cpp @@ -52,8 +52,8 @@ private: } }; -TaskbarWindow::TaskbarWindow(NonnullRefPtr start_menu) - : m_start_menu(move(start_menu)) +TaskbarWindow::TaskbarWindow(NonnullRefPtr system_menu) + : m_system_menu(move(system_menu)) { set_window_type(GUI::WindowType::Taskbar); set_title("Taskbar"); @@ -69,7 +69,7 @@ TaskbarWindow::TaskbarWindow(NonnullRefPtr start_menu) m_start_button->set_icon_spacing(0); auto app_icon = GUI::Icon::default_icon("ladyball"sv); m_start_button->set_icon(app_icon.bitmap_for_size(16)); - m_start_button->set_menu(m_start_menu); + m_start_button->set_menu(m_system_menu); main_widget.add_child(*m_start_button); main_widget.add(); @@ -296,10 +296,10 @@ void TaskbarWindow::wm_event(GUI::WMEvent& event) break; } case GUI::Event::WM_SuperKeyPressed: { - if (m_start_menu->is_visible()) { - m_start_menu->dismiss(); + if (m_system_menu->is_visible()) { + m_system_menu->dismiss(); } else { - m_start_menu->popup(m_start_button->screen_relative_rect().top_left()); + m_system_menu->popup(m_start_button->screen_relative_rect().top_left()); } break; } diff --git a/Userland/Services/Taskbar/TaskbarWindow.h b/Userland/Services/Taskbar/TaskbarWindow.h index 10c0a2fa47..0e62403c61 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.h +++ b/Userland/Services/Taskbar/TaskbarWindow.h @@ -28,7 +28,7 @@ public: virtual void config_string_did_change(String const&, String const&, String const&, String const&) override; private: - explicit TaskbarWindow(NonnullRefPtr start_menu); + explicit TaskbarWindow(NonnullRefPtr system_menu); static void show_desktop_button_clicked(unsigned); static void toggle_show_desktop(); void set_quick_launch_button_data(GUI::Button&, String const&, NonnullRefPtr); @@ -49,7 +49,7 @@ private: void set_start_button_font(Gfx::Font const&); - NonnullRefPtr m_start_menu; + NonnullRefPtr m_system_menu; RefPtr m_task_button_container; RefPtr m_default_icon; diff --git a/Userland/Services/WindowServer/WindowFrame.cpp b/Userland/Services/WindowServer/WindowFrame.cpp index 8ea1f4be6c..7a20a78b0d 100644 --- a/Userland/Services/WindowServer/WindowFrame.cpp +++ b/Userland/Services/WindowServer/WindowFrame.cpp @@ -767,7 +767,7 @@ bool WindowFrame::handle_titlebar_icon_mouse_event(MouseEvent const& event) // this click, and when we receive the MouseUp event check if // it would have been considered a double click, if it weren't // for the fact that we opened and closed a window in the meanwhile - wm.start_menu_doubleclick(m_window, event); + wm.system_menu_doubleclick(m_window, event); m_window.popup_window_menu(titlebar_rect().bottom_left().translated(rect().location()), WindowMenuDefaultAction::Close); return true; diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp index bae6c6c10a..5175c35e72 100644 --- a/Userland/Services/WindowServer/WindowManager.cpp +++ b/Userland/Services/WindowServer/WindowManager.cpp @@ -1084,7 +1084,7 @@ bool WindowManager::is_considered_doubleclick(MouseEvent const& event, DoubleCli return false; } -void WindowManager::start_menu_doubleclick(Window& window, MouseEvent const& event) +void WindowManager::system_menu_doubleclick(Window& window, MouseEvent const& event) { // This is a special case. Basically, we're trying to determine whether // double clicking on the window menu icon happened. In this case, the diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h index efad2a6529..feb4e10e00 100644 --- a/Userland/Services/WindowServer/WindowManager.h +++ b/Userland/Services/WindowServer/WindowManager.h @@ -210,7 +210,7 @@ public: void did_popup_a_menu(Badge); - void start_menu_doubleclick(Window& window, MouseEvent const& event); + void system_menu_doubleclick(Window& window, MouseEvent const& event); bool is_menu_doubleclick(Window& window, MouseEvent const& event) const; void minimize_windows(Window&, bool);