RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 23:27:35 +00:00
Code Issues Activity Actions

WindowServer+LibGfx: Add Gfx::StandardCursor::Hidden cursor

Browse source
This commit is contained in:
Brendan Coles 2020-11-02 06:28:14 +00:00 • committed by Andreas Kling
parent 328915a279
commit fb5ea8a212
6 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ Height=768
Name=Default Name=Default
[Cursor] [Cursor]
Hidden=/res/cursors/hidden.png
Arrow=/res/cursors/arrow.png Arrow=/res/cursors/arrow.png
ResizeH=/res/cursors/resize-horizontal.png ResizeH=/res/cursors/resize-horizontal.png
ResizeV=/res/cursors/resize-vertical.png ResizeV=/res/cursors/resize-vertical.png

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 128 B

1
Libraries/LibGfx/StandardCursor.h
View file

@ -30,6 +30,7 @@ namespace Gfx {
enum class StandardCursor { enum class StandardCursor {
None = 0, None = 0,
Hidden,
Arrow, Arrow,
Crosshair, Crosshair,
IBeam, IBeam,

2
Services/WindowServer/Cursor.cpp
View file

@ -54,6 +54,8 @@ RefPtr<Cursor> Cursor::create(Gfx::StandardCursor standard_cursor)
switch (standard_cursor) { switch (standard_cursor) {
case Gfx::StandardCursor::None: case Gfx::StandardCursor::None:
return nullptr; return nullptr;
case Gfx::StandardCursor::Hidden:
return WindowManager::the().hidden_cursor();
case Gfx::StandardCursor::Arrow: case Gfx::StandardCursor::Arrow:
return WindowManager::the().arrow_cursor(); return WindowManager::the().arrow_cursor();
case Gfx::StandardCursor::Crosshair: case Gfx::StandardCursor::Crosshair:

1
Services/WindowServer/WindowManager.cpp
View file

@ -112,6 +112,7 @@ void WindowManager::reload_config(bool set_screen)
set_resolution(m_config->read_num_entry("Screen", "Width", 1920), m_config->read_num_entry("Screen", "Height", 1080)); set_resolution(m_config->read_num_entry("Screen", "Width", 1920), m_config->read_num_entry("Screen", "Height", 1080));
} }
m_hidden_cursor = get_cursor("Hidden");
m_arrow_cursor = get_cursor("Arrow", { 2, 2 }); m_arrow_cursor = get_cursor("Arrow", { 2, 2 });
m_hand_cursor = get_cursor("Hand", { 8, 4 }); m_hand_cursor = get_cursor("Hand", { 8, 4 });
m_help_cursor = get_cursor("Help", { 1, 1 }); m_help_cursor = get_cursor("Help", { 1, 1 });

2
Services/WindowServer/WindowManager.h
View file

@ -123,6 +123,7 @@ public:
Gfx::IntRect desktop_rect() const; Gfx::IntRect desktop_rect() const;
const Cursor& active_cursor() const; const Cursor& active_cursor() const;
const Cursor& hidden_cursor() const { return *m_hidden_cursor; }
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& 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; }
@ -247,6 +248,7 @@ private:
void do_move_to_front(Window&, bool, bool); void do_move_to_front(Window&, bool, bool);
RefPtr<Cursor> m_hidden_cursor;
RefPtr<Cursor> m_arrow_cursor; RefPtr<Cursor> m_arrow_cursor;
RefPtr<Cursor> m_hand_cursor; RefPtr<Cursor> m_hand_cursor;
RefPtr<Cursor> m_help_cursor; RefPtr<Cursor> m_help_cursor;