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

WindowServer+LibGUI: Add "resize row/column" cursors

Browse source
This commit is contained in:
Linus Groh 2020-07-07 19:19:56 +01:00 • committed by Andreas Kling
parent 2dd40aac4d
commit 62866208ee
8 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,8 @@ ResizeH=/res/cursors/resize-horizontal.png
ResizeV=/res/cursors/resize-vertical.png ResizeV=/res/cursors/resize-vertical.png
ResizeDTLBR=/res/cursors/resize-diagonal-tlbr.png ResizeDTLBR=/res/cursors/resize-diagonal-tlbr.png
ResizeDBLTR=/res/cursors/resize-diagonal-bltr.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 IBeam=/res/cursors/i-beam.png
Disallowed=/res/cursors/disallowed.png Disallowed=/res/cursors/disallowed.png
Move=/res/cursors/move.png Move=/res/cursors/move.png

BIN
Base/res/cursors/resize-column.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
Base/res/cursors/resize-row.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB

2
Libraries/LibGUI/Window.h
View file

@ -46,6 +46,8 @@ enum class StandardCursor {
ResizeVertical, ResizeVertical,
ResizeDiagonalTLBR, ResizeDiagonalTLBR,
ResizeDiagonalBLTR, ResizeDiagonalBLTR,
ResizeColumn,
ResizeRow,
Hand, Hand,
Drag, Drag,
Move, Move,

4
Services/WindowServer/Cursor.cpp
View file

@ -66,6 +66,10 @@ RefPtr<Cursor> Cursor::create(StandardCursor standard_cursor)
return WindowManager::the().resize_diagonally_tlbr_cursor(); return WindowManager::the().resize_diagonally_tlbr_cursor();
case StandardCursor::ResizeDiagonalBLTR: case StandardCursor::ResizeDiagonalBLTR:
return WindowManager::the().resize_diagonally_bltr_cursor(); 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: case StandardCursor::Hand:
return WindowManager::the().hand_cursor(); return WindowManager::the().hand_cursor();
case StandardCursor::Drag: case StandardCursor::Drag:

2
Services/WindowServer/Cursor.h
View file

@ -38,6 +38,8 @@ enum class StandardCursor {
ResizeVertical, ResizeVertical,
ResizeDiagonalTLBR, ResizeDiagonalTLBR,
ResizeDiagonalBLTR, ResizeDiagonalBLTR,
ResizeColumn,
ResizeRow,
Hand, Hand,
Drag, Drag,
Move, Move,

2
Services/WindowServer/WindowManager.cpp
View file

@ -117,6 +117,8 @@ void WindowManager::reload_config(bool set_screen)
m_resize_vertically_cursor = get_cursor("ResizeV"); m_resize_vertically_cursor = get_cursor("ResizeV");
m_resize_diagonally_tlbr_cursor = get_cursor("ResizeDTLBR"); m_resize_diagonally_tlbr_cursor = get_cursor("ResizeDTLBR");
m_resize_diagonally_bltr_cursor = get_cursor("ResizeDBLTR"); 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_i_beam_cursor = get_cursor("IBeam");
m_disallowed_cursor = get_cursor("Disallowed"); m_disallowed_cursor = get_cursor("Disallowed");
m_move_cursor = get_cursor("Move"); m_move_cursor = get_cursor("Move");

4
Services/WindowServer/WindowManager.h
View file

@ -126,6 +126,8 @@ public:
const Cursor& resize_vertically_cursor() const { return *m_resize_vertically_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; } 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_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& i_beam_cursor() const { return *m_i_beam_cursor; }
const Cursor& disallowed_cursor() const { return *m_disallowed_cursor; } const Cursor& disallowed_cursor() const { return *m_disallowed_cursor; }
const Cursor& move_cursor() const { return *m_move_cursor; } const Cursor& move_cursor() const { return *m_move_cursor; }
@ -206,6 +208,8 @@ private:
RefPtr<Cursor> m_resize_vertically_cursor; RefPtr<Cursor> m_resize_vertically_cursor;
RefPtr<Cursor> m_resize_diagonally_tlbr_cursor; RefPtr<Cursor> m_resize_diagonally_tlbr_cursor;
RefPtr<Cursor> m_resize_diagonally_bltr_cursor; RefPtr<Cursor> m_resize_diagonally_bltr_cursor;
RefPtr<Cursor> m_resize_column_cursor;
RefPtr<Cursor> m_resize_row_cursor;
RefPtr<Cursor> m_i_beam_cursor; RefPtr<Cursor> m_i_beam_cursor;
RefPtr<Cursor> m_disallowed_cursor; RefPtr<Cursor> m_disallowed_cursor;
RefPtr<Cursor> m_move_cursor; RefPtr<Cursor> m_move_cursor;