diff --git a/Base/etc/WindowServer/WindowServer.ini b/Base/etc/WindowServer/WindowServer.ini index 2c38f4eb59..877e2e9e1d 100644 --- a/Base/etc/WindowServer/WindowServer.ini +++ b/Base/etc/WindowServer/WindowServer.ini @@ -11,6 +11,8 @@ ResizeH=/res/cursors/resize-horizontal.png ResizeV=/res/cursors/resize-vertical.png ResizeDTLBR=/res/cursors/resize-diagonal-tlbr.png ResizeDBLTR=/res/cursors/resize-diagonal-bltr.png +ResizeColumn=/res/cursors/resize-column.png +ResizeRow=/res/cursors/resize-row.png IBeam=/res/cursors/i-beam.png Disallowed=/res/cursors/disallowed.png Move=/res/cursors/move.png diff --git a/Base/res/cursors/resize-column.png b/Base/res/cursors/resize-column.png new file mode 100644 index 0000000000..6316a07893 Binary files /dev/null and b/Base/res/cursors/resize-column.png differ diff --git a/Base/res/cursors/resize-row.png b/Base/res/cursors/resize-row.png new file mode 100644 index 0000000000..e73b9c62a0 Binary files /dev/null and b/Base/res/cursors/resize-row.png differ diff --git a/Libraries/LibGUI/Window.h b/Libraries/LibGUI/Window.h index ae0fb5d588..c173b1e18b 100644 --- a/Libraries/LibGUI/Window.h +++ b/Libraries/LibGUI/Window.h @@ -46,6 +46,8 @@ enum class StandardCursor { ResizeVertical, ResizeDiagonalTLBR, ResizeDiagonalBLTR, + ResizeColumn, + ResizeRow, Hand, Drag, Move, diff --git a/Services/WindowServer/Cursor.cpp b/Services/WindowServer/Cursor.cpp index 43db849731..da649f94af 100644 --- a/Services/WindowServer/Cursor.cpp +++ b/Services/WindowServer/Cursor.cpp @@ -66,6 +66,10 @@ RefPtr Cursor::create(StandardCursor standard_cursor) return WindowManager::the().resize_diagonally_tlbr_cursor(); case StandardCursor::ResizeDiagonalBLTR: return WindowManager::the().resize_diagonally_bltr_cursor(); + case StandardCursor::ResizeColumn: + return WindowManager::the().resize_column_cursor(); + case StandardCursor::ResizeRow: + return WindowManager::the().resize_row_cursor(); case StandardCursor::Hand: return WindowManager::the().hand_cursor(); case StandardCursor::Drag: diff --git a/Services/WindowServer/Cursor.h b/Services/WindowServer/Cursor.h index 2abbb21aad..0d1e35418f 100644 --- a/Services/WindowServer/Cursor.h +++ b/Services/WindowServer/Cursor.h @@ -38,6 +38,8 @@ enum class StandardCursor { ResizeVertical, ResizeDiagonalTLBR, ResizeDiagonalBLTR, + ResizeColumn, + ResizeRow, Hand, Drag, Move, diff --git a/Services/WindowServer/WindowManager.cpp b/Services/WindowServer/WindowManager.cpp index a1e98571dd..ac2f3740f0 100644 --- a/Services/WindowServer/WindowManager.cpp +++ b/Services/WindowServer/WindowManager.cpp @@ -117,6 +117,8 @@ void WindowManager::reload_config(bool set_screen) m_resize_vertically_cursor = get_cursor("ResizeV"); m_resize_diagonally_tlbr_cursor = get_cursor("ResizeDTLBR"); m_resize_diagonally_bltr_cursor = get_cursor("ResizeDBLTR"); + m_resize_column_cursor = get_cursor("ResizeColumn"); + m_resize_row_cursor = get_cursor("ResizeRow"); m_i_beam_cursor = get_cursor("IBeam"); m_disallowed_cursor = get_cursor("Disallowed"); m_move_cursor = get_cursor("Move"); diff --git a/Services/WindowServer/WindowManager.h b/Services/WindowServer/WindowManager.h index 3f4707032b..f57d21a3e5 100644 --- a/Services/WindowServer/WindowManager.h +++ b/Services/WindowServer/WindowManager.h @@ -126,6 +126,8 @@ public: const Cursor& resize_vertically_cursor() const { return *m_resize_vertically_cursor; } const Cursor& resize_diagonally_tlbr_cursor() const { return *m_resize_diagonally_tlbr_cursor; } const Cursor& resize_diagonally_bltr_cursor() const { return *m_resize_diagonally_bltr_cursor; } + const Cursor& resize_column_cursor() const { return *m_resize_column_cursor; } + const Cursor& resize_row_cursor() const { return *m_resize_row_cursor; } const Cursor& i_beam_cursor() const { return *m_i_beam_cursor; } const Cursor& disallowed_cursor() const { return *m_disallowed_cursor; } const Cursor& move_cursor() const { return *m_move_cursor; } @@ -206,6 +208,8 @@ private: RefPtr m_resize_vertically_cursor; RefPtr m_resize_diagonally_tlbr_cursor; RefPtr m_resize_diagonally_bltr_cursor; + RefPtr m_resize_column_cursor; + RefPtr m_resize_row_cursor; RefPtr m_i_beam_cursor; RefPtr m_disallowed_cursor; RefPtr m_move_cursor;