diff options
-rw-r--r-- | Base/res/cursor-themes/Dark/Config.ini | 1 | ||||
-rw-r--r-- | Base/res/cursor-themes/Dark/zoom.x0y0.png | bin | 0 -> 527 bytes | |||
-rw-r--r-- | Base/res/cursor-themes/Default/Config.ini | 1 | ||||
-rw-r--r-- | Base/res/cursor-themes/Default/zoom.x0y0.png | bin | 0 -> 617 bytes | |||
-rw-r--r-- | Userland/Libraries/LibGfx/StandardCursor.h | 1 | ||||
-rw-r--r-- | Userland/Services/WindowServer/Cursor.cpp | 2 | ||||
-rw-r--r-- | Userland/Services/WindowServer/WindowManager.cpp | 1 | ||||
-rw-r--r-- | Userland/Services/WindowServer/WindowManager.h | 2 |
8 files changed, 8 insertions, 0 deletions
diff --git a/Base/res/cursor-themes/Dark/Config.ini b/Base/res/cursor-themes/Dark/Config.ini index 88cc11daae..7813a6b945 100644 --- a/Base/res/cursor-themes/Dark/Config.ini +++ b/Base/res/cursor-themes/Dark/Config.ini @@ -16,3 +16,4 @@ Drag=drag.png Wait=wait.f14t100.png Crosshair=crosshair.png Eyedropper=eyedropper.x2y2.png +Zoom=zoom.x0y0.png
\ No newline at end of file diff --git a/Base/res/cursor-themes/Dark/zoom.x0y0.png b/Base/res/cursor-themes/Dark/zoom.x0y0.png Binary files differnew file mode 100644 index 0000000000..0d5e7c481f --- /dev/null +++ b/Base/res/cursor-themes/Dark/zoom.x0y0.png diff --git a/Base/res/cursor-themes/Default/Config.ini b/Base/res/cursor-themes/Default/Config.ini index 88cc11daae..7813a6b945 100644 --- a/Base/res/cursor-themes/Default/Config.ini +++ b/Base/res/cursor-themes/Default/Config.ini @@ -16,3 +16,4 @@ Drag=drag.png Wait=wait.f14t100.png Crosshair=crosshair.png Eyedropper=eyedropper.x2y2.png +Zoom=zoom.x0y0.png
\ No newline at end of file diff --git a/Base/res/cursor-themes/Default/zoom.x0y0.png b/Base/res/cursor-themes/Default/zoom.x0y0.png Binary files differnew file mode 100644 index 0000000000..8a6fdd810b --- /dev/null +++ b/Base/res/cursor-themes/Default/zoom.x0y0.png diff --git a/Userland/Libraries/LibGfx/StandardCursor.h b/Userland/Libraries/LibGfx/StandardCursor.h index 1e15852dbf..9a8a9c97b6 100644 --- a/Userland/Libraries/LibGfx/StandardCursor.h +++ b/Userland/Libraries/LibGfx/StandardCursor.h @@ -27,6 +27,7 @@ enum class StandardCursor { Wait, Disallowed, Eyedropper, + Zoom, __Count, }; diff --git a/Userland/Services/WindowServer/Cursor.cpp b/Userland/Services/WindowServer/Cursor.cpp index 18fc08f6a3..07ce2ab1f8 100644 --- a/Userland/Services/WindowServer/Cursor.cpp +++ b/Userland/Services/WindowServer/Cursor.cpp @@ -111,6 +111,8 @@ RefPtr<Cursor> Cursor::create(Gfx::StandardCursor standard_cursor) return WindowManager::the().disallowed_cursor(); case Gfx::StandardCursor::Eyedropper: return WindowManager::the().eyedropper_cursor(); + case Gfx::StandardCursor::Zoom: + return WindowManager::the().zoom_cursor(); default: VERIFY_NOT_REACHED(); } diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp index be415582c2..c816377c71 100644 --- a/Userland/Services/WindowServer/WindowManager.cpp +++ b/Userland/Services/WindowServer/WindowManager.cpp @@ -2081,6 +2081,7 @@ void WindowManager::apply_cursor_theme(const String& theme_name) reload_cursor(m_wait_cursor, "Wait"); reload_cursor(m_crosshair_cursor, "Crosshair"); reload_cursor(m_eyedropper_cursor, "Eyedropper"); + reload_cursor(m_zoom_cursor, "Zoom"); Compositor::the().invalidate_cursor(); m_config->write_entry("Mouse", "CursorTheme", theme_name); diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h index ccfd363e06..98dd20ec0f 100644 --- a/Userland/Services/WindowServer/WindowManager.h +++ b/Userland/Services/WindowServer/WindowManager.h @@ -151,6 +151,7 @@ public: Cursor const& drag_cursor() const { return *m_drag_cursor; } Cursor const& wait_cursor() const { return *m_wait_cursor; } Cursor const& eyedropper_cursor() const { return *m_eyedropper_cursor; } + Cursor const& zoom_cursor() const { return *m_zoom_cursor; } Gfx::Font const& font() const; Gfx::Font const& window_title_font() const; @@ -366,6 +367,7 @@ private: RefPtr<Cursor> m_wait_cursor; RefPtr<Cursor> m_crosshair_cursor; RefPtr<Cursor> m_eyedropper_cursor; + RefPtr<Cursor> m_zoom_cursor; RefPtr<MultiScaleBitmaps> m_overlay_rect_shadow; |