RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:57:45 +00:00
Code Issues Activity Actions

CatDog: Remove global menu and add context menu

Browse source 
There was no way to close catdog since it relied on global menus, this
adds a context menu for opening the about dialog and quitting.

Fixes #7252
This commit is contained in:
Marcus Nilsson 2021-05-18 19:12:05 +02:00 • committed by Linus Groh
parent 9c963fa17b
commit e5367c13d8
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Demos/CatDog/CatDog.cpp
View file

@ -137,3 +137,9 @@ void CatDog::track_cursor_globally()
set_global_cursor_tracking(true); set_global_cursor_tracking(true);
GUI::WindowServerConnection::the().set_global_cursor_tracking(window_id, true); GUI::WindowServerConnection::the().set_global_cursor_tracking(window_id, true);
} }
void CatDog::context_menu_event(GUI::ContextMenuEvent& event)
{
if (on_context_menu_request)
on_context_menu_request(event);
}

4
Userland/Demos/CatDog/CatDog.h
View file

@ -5,6 +5,7 @@
*/ */
#include <LibCore/ElapsedTimer.h> #include <LibCore/ElapsedTimer.h>
#include <LibGUI/Menu.h>
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
#include <math.h> #include <math.h>
#include <unistd.h> #include <unistd.h>
@ -19,11 +20,13 @@ public:
virtual void paint_event(GUI::PaintEvent& event) override; virtual void paint_event(GUI::PaintEvent& event) override;
virtual void mousemove_event(GUI::MouseEvent& event) override; virtual void mousemove_event(GUI::MouseEvent& event) override;
virtual void mousedown_event(GUI::MouseEvent& event) override; virtual void mousedown_event(GUI::MouseEvent& event) override;
virtual void context_menu_event(GUI::ContextMenuEvent& event) override;
void track_cursor_globally(); void track_cursor_globally();
void start_the_timer() { m_timer.start(); } void start_the_timer() { m_timer.start(); }
Function<void()> on_click; Function<void()> on_click;
Function<void(GUI::ContextMenuEvent&)> on_context_menu_request;
bool roaming() const { return m_roaming; } bool roaming() const { return m_roaming; }
void set_roaming(bool roaming) void set_roaming(bool roaming)
@ -40,6 +43,7 @@ public:
private: private:
Gfx::IntPoint m_temp_pos; Gfx::IntPoint m_temp_pos;
Core::ElapsedTimer m_timer; Core::ElapsedTimer m_timer;
int m_curr_frame = 1; int m_curr_frame = 1;
int m_moveX, m_moveY = 0; int m_moveX, m_moveY = 0;
bool m_up, m_down, m_left, m_right, m_sleeping = false; bool m_up, m_down, m_left, m_right, m_sleeping = false;

17
Userland/Demos/CatDog/main.cpp
View file

@ -53,15 +53,10 @@ int main(int argc, char** argv)
catdog_widget.set_layout<GUI::VerticalBoxLayout>(); catdog_widget.set_layout<GUI::VerticalBoxLayout>();
catdog_widget.layout()->set_spacing(0); catdog_widget.layout()->set_spacing(0);
auto menubar = GUI::Menubar::construct(); auto context_menu = GUI::Menu::construct();
context_menu->add_action(GUI::CommonActions::make_about_action("CatDog Demo", app_icon, window));
auto& file_menu = menubar->add_menu("&File"); context_menu->add_separator();
file_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); context_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
auto& help_menu = menubar->add_menu("&Help");
help_menu.add_action(GUI::CommonActions::make_about_action("CatDog Demo", app_icon, window));
window->set_menubar(move(menubar));
window->show(); window->show();
catdog_widget.track_cursor_globally(); catdog_widget.track_cursor_globally();
@ -106,5 +101,9 @@ int main(int argc, char** argv)
advice_timer->start(); advice_timer->start();
}; };
catdog_widget.on_context_menu_request = [&](GUI::ContextMenuEvent event) {
context_menu->popup(event.screen_position());
};
return app->exec(); return app->exec();
} }