From b8a8e417f1907f67dffb14b7e570b0f730a09a7f Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Tue, 7 Jul 2020 20:01:29 +0100 Subject: [PATCH] WindowServer+LibGUI: Add "help" cursor --- Base/etc/WindowServer/WindowServer.ini | 1 + Base/res/cursors/help.png | Bin 0 -> 3931 bytes Libraries/LibGUI/Window.h | 1 + Services/WindowServer/Cursor.cpp | 2 ++ Services/WindowServer/Cursor.h | 1 + Services/WindowServer/WindowManager.cpp | 1 + Services/WindowServer/WindowManager.h | 2 ++ 7 files changed, 8 insertions(+) create mode 100755 Base/res/cursors/help.png diff --git a/Base/etc/WindowServer/WindowServer.ini b/Base/etc/WindowServer/WindowServer.ini index 877e2e9e1d..74e22cb6e1 100644 --- a/Base/etc/WindowServer/WindowServer.ini +++ b/Base/etc/WindowServer/WindowServer.ini @@ -17,6 +17,7 @@ IBeam=/res/cursors/i-beam.png Disallowed=/res/cursors/disallowed.png Move=/res/cursors/move.png Hand=/res/cursors/hand.png +Help=/res/cursors/help.png Drag=/res/cursors/drag.png [Input] diff --git a/Base/res/cursors/help.png b/Base/res/cursors/help.png new file mode 100755 index 0000000000000000000000000000000000000000..c14c29d45301d624d77df57f5df146d71ff3c0f2 GIT binary patch literal 3931 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 literal 0 HcmV?d00001 diff --git a/Libraries/LibGUI/Window.h b/Libraries/LibGUI/Window.h index c173b1e18b..9a7b4ada74 100644 --- a/Libraries/LibGUI/Window.h +++ b/Libraries/LibGUI/Window.h @@ -49,6 +49,7 @@ enum class StandardCursor { ResizeColumn, ResizeRow, Hand, + Help, Drag, Move, }; diff --git a/Services/WindowServer/Cursor.cpp b/Services/WindowServer/Cursor.cpp index da649f94af..6dd0e48c25 100644 --- a/Services/WindowServer/Cursor.cpp +++ b/Services/WindowServer/Cursor.cpp @@ -72,6 +72,8 @@ RefPtr Cursor::create(StandardCursor standard_cursor) return WindowManager::the().resize_row_cursor(); case StandardCursor::Hand: return WindowManager::the().hand_cursor(); + case StandardCursor::Help: + return WindowManager::the().help_cursor(); case StandardCursor::Drag: return WindowManager::the().drag_cursor(); case StandardCursor::Move: diff --git a/Services/WindowServer/Cursor.h b/Services/WindowServer/Cursor.h index 0d1e35418f..45e57303e4 100644 --- a/Services/WindowServer/Cursor.h +++ b/Services/WindowServer/Cursor.h @@ -41,6 +41,7 @@ enum class StandardCursor { ResizeColumn, ResizeRow, Hand, + Help, Drag, Move, }; diff --git a/Services/WindowServer/WindowManager.cpp b/Services/WindowServer/WindowManager.cpp index ac2f3740f0..6a0df85054 100644 --- a/Services/WindowServer/WindowManager.cpp +++ b/Services/WindowServer/WindowManager.cpp @@ -113,6 +113,7 @@ void WindowManager::reload_config(bool set_screen) m_arrow_cursor = get_cursor("Arrow", { 2, 2 }); m_hand_cursor = get_cursor("Hand", { 8, 4 }); + m_help_cursor = get_cursor("Help", { 1, 1 }); m_resize_horizontally_cursor = get_cursor("ResizeH"); m_resize_vertically_cursor = get_cursor("ResizeV"); m_resize_diagonally_tlbr_cursor = get_cursor("ResizeDTLBR"); diff --git a/Services/WindowServer/WindowManager.h b/Services/WindowServer/WindowManager.h index f57d21a3e5..6b49230eaa 100644 --- a/Services/WindowServer/WindowManager.h +++ b/Services/WindowServer/WindowManager.h @@ -122,6 +122,7 @@ public: const Cursor& active_cursor() const; const Cursor& arrow_cursor() const { return *m_arrow_cursor; } const Cursor& hand_cursor() const { return *m_hand_cursor; } + const Cursor& help_cursor() const { return *m_help_cursor; } const Cursor& resize_horizontally_cursor() const { return *m_resize_horizontally_cursor; } const Cursor& resize_vertically_cursor() const { return *m_resize_vertically_cursor; } const Cursor& resize_diagonally_tlbr_cursor() const { return *m_resize_diagonally_tlbr_cursor; } @@ -204,6 +205,7 @@ private: RefPtr m_arrow_cursor; RefPtr m_hand_cursor; + RefPtr m_help_cursor; RefPtr m_resize_horizontally_cursor; RefPtr m_resize_vertically_cursor; RefPtr m_resize_diagonally_tlbr_cursor;