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

WindowServer: Show a special "move" cursor when dragging windows around.

Browse source
This commit is contained in:
Andreas Kling 2019-03-31 22:42:13 +02:00
parent af09f994ba
commit 42c95959a8
3 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 711 B

4
Servers/WindowServer/WSWindowManager.cpp
View file

@ -167,6 +167,7 @@ WSWindowManager::WSWindowManager()
m_resize_diagonally_bltr_cursor = WSCursor::create(*GraphicsBitmap::load_from_file("/res/cursors/resize-diagonal-bltr.png")); m_resize_diagonally_bltr_cursor = WSCursor::create(*GraphicsBitmap::load_from_file("/res/cursors/resize-diagonal-bltr.png"));
m_i_beam_cursor = WSCursor::create(*GraphicsBitmap::load_from_file("/res/cursors/i-beam.png")); m_i_beam_cursor = WSCursor::create(*GraphicsBitmap::load_from_file("/res/cursors/i-beam.png"));
m_disallowed_cursor = WSCursor::create(*GraphicsBitmap::load_from_file("/res/cursors/disallowed.png")); m_disallowed_cursor = WSCursor::create(*GraphicsBitmap::load_from_file("/res/cursors/disallowed.png"));
m_move_cursor = WSCursor::create(*GraphicsBitmap::load_from_file("/res/cursors/move.png"));
m_wallpaper_path = "/res/wallpapers/retro.rgb"; m_wallpaper_path = "/res/wallpapers/retro.rgb";
m_wallpaper = GraphicsBitmap::load_from_file(GraphicsBitmap::Format::RGBA32, m_wallpaper_path, { 1024, 768 }); m_wallpaper = GraphicsBitmap::load_from_file(GraphicsBitmap::Format::RGBA32, m_wallpaper_path, { 1024, 768 });
@ -1238,6 +1239,9 @@ void WSWindowManager::notify_client_changed_app_menubar(WSClientConnection& clie
const WSCursor& WSWindowManager::active_cursor() const const WSCursor& WSWindowManager::active_cursor() const
{ {
if (m_drag_window)
return *m_move_cursor;
if (m_resize_window) { if (m_resize_window) {
switch (m_resize_direction) { switch (m_resize_direction) {
case ResizeDirection::Up: case ResizeDirection::Up:

1
Servers/WindowServer/WSWindowManager.h
View file

@ -164,6 +164,7 @@ private:
RetainPtr<WSCursor> m_resize_diagonally_bltr_cursor; RetainPtr<WSCursor> m_resize_diagonally_bltr_cursor;
RetainPtr<WSCursor> m_i_beam_cursor; RetainPtr<WSCursor> m_i_beam_cursor;
RetainPtr<WSCursor> m_disallowed_cursor; RetainPtr<WSCursor> m_disallowed_cursor;
RetainPtr<WSCursor> m_move_cursor;
OwnPtr<Painter> m_back_painter; OwnPtr<Painter> m_back_painter;
OwnPtr<Painter> m_front_painter; OwnPtr<Painter> m_front_painter;