RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:37:37 +00:00
Code Issues Activity Actions

WindowServer+LibGfx: Added Crosshair cursor

Browse source
This commit is contained in:
Uma Sankar Yedida 2020-10-30 22:36:32 +05:30 • committed by Andreas Kling
parent ddad7575a9
commit 9ccae7a908
7 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Base/etc/WindowServer/WindowServer.ini
View file

@ -20,6 +20,7 @@ Hand=/res/cursors/hand.png
Help=/res/cursors/help.png Help=/res/cursors/help.png
Drag=/res/cursors/drag.png Drag=/res/cursors/drag.png
Wait=/res/cursors/wait.png Wait=/res/cursors/wait.png
Crosshair=/res/cursors/crosshair.png
[Input] [Input]
DoubleClickSpeed=250 DoubleClickSpeed=250

BIN
Base/res/cursors/crosshair.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 142 B

4
Demos/WidgetGallery/main.cpp
View file

@ -521,6 +521,10 @@ int main(int argc, char** argv)
radio_cursor_arrow.on_checked = [&](bool) { radio_cursor_arrow.on_checked = [&](bool) {
window->set_cursor(Gfx::StandardCursor::Arrow); window->set_cursor(Gfx::StandardCursor::Arrow);
}; };
auto& radio_crosshair_arrow = cursor_group_box.add<GUI::RadioButton>("Crosshair");
radio_crosshair_arrow.on_checked = [&](bool) {
window->set_cursor(Gfx::StandardCursor::Crosshair);
};
auto& radio_cursor_i_beam = cursor_group_box.add<GUI::RadioButton>("IBeam"); auto& radio_cursor_i_beam = cursor_group_box.add<GUI::RadioButton>("IBeam");
radio_cursor_i_beam.on_checked = [&](bool) { radio_cursor_i_beam.on_checked = [&](bool) {
window->set_cursor(Gfx::StandardCursor::IBeam); window->set_cursor(Gfx::StandardCursor::IBeam);

1
Libraries/LibGfx/StandardCursor.h
View file

@ -31,6 +31,7 @@ namespace Gfx {
enum class StandardCursor { enum class StandardCursor {
None = 0, None = 0,
Arrow, Arrow,
Crosshair,
IBeam, IBeam,
ResizeHorizontal, ResizeHorizontal,
ResizeVertical, ResizeVertical,

2
Services/WindowServer/Cursor.cpp
View file

@ -56,6 +56,8 @@ RefPtr<Cursor> Cursor::create(Gfx::StandardCursor standard_cursor)
return nullptr; return nullptr;
case Gfx::StandardCursor::Arrow: case Gfx::StandardCursor::Arrow:
return WindowManager::the().arrow_cursor(); return WindowManager::the().arrow_cursor();
case Gfx::StandardCursor::Crosshair:
return WindowManager::the().crosshair_cursor();
case Gfx::StandardCursor::IBeam: case Gfx::StandardCursor::IBeam:
return WindowManager::the().i_beam_cursor(); return WindowManager::the().i_beam_cursor();
case Gfx::StandardCursor::ResizeHorizontal: case Gfx::StandardCursor::ResizeHorizontal:

1
Services/WindowServer/WindowManager.cpp
View file

@ -126,6 +126,7 @@ void WindowManager::reload_config(bool set_screen)
m_move_cursor = get_cursor("Move"); m_move_cursor = get_cursor("Move");
m_drag_cursor = get_cursor("Drag"); m_drag_cursor = get_cursor("Drag");
m_wait_cursor = get_cursor("Wait"); m_wait_cursor = get_cursor("Wait");
m_crosshair_cursor = get_cursor("Crosshair");
} }
const Gfx::Font& WindowManager::font() const const Gfx::Font& WindowManager::font() const

2
Services/WindowServer/WindowManager.h
View file

@ -124,6 +124,7 @@ public:
const Cursor& active_cursor() const; const Cursor& active_cursor() const;
const Cursor& arrow_cursor() const { return *m_arrow_cursor; } const Cursor& arrow_cursor() const { return *m_arrow_cursor; }
const Cursor& crosshair_cursor() const { return *m_crosshair_cursor; }
const Cursor& hand_cursor() const { return *m_hand_cursor; } const Cursor& hand_cursor() const { return *m_hand_cursor; }
const Cursor& help_cursor() const { return *m_help_cursor; } const Cursor& help_cursor() const { return *m_help_cursor; }
const Cursor& resize_horizontally_cursor() const { return *m_resize_horizontally_cursor; } const Cursor& resize_horizontally_cursor() const { return *m_resize_horizontally_cursor; }
@ -260,6 +261,7 @@ private:
RefPtr<Cursor> m_move_cursor; RefPtr<Cursor> m_move_cursor;
RefPtr<Cursor> m_drag_cursor; RefPtr<Cursor> m_drag_cursor;
RefPtr<Cursor> m_wait_cursor; RefPtr<Cursor> m_wait_cursor;
RefPtr<Cursor> m_crosshair_cursor;
InlineLinkedList<Window> m_windows_in_order; InlineLinkedList<Window> m_windows_in_order;