From 42c95959a8ea883669491499d8d890881ff20031 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Sun, 31 Mar 2019 22:42:13 +0200
Subject: [PATCH] WindowServer: Show a special "move" cursor when dragging
 windows around.

---
 Base/res/cursors/move.png                | Bin 0 -> 711 bytes
 Servers/WindowServer/WSWindowManager.cpp |   4 ++++
 Servers/WindowServer/WSWindowManager.h   |   1 +
 3 files changed, 5 insertions(+)
 create mode 100644 Base/res/cursors/move.png

diff --git a/Base/res/cursors/move.png b/Base/res/cursors/move.png
new file mode 100644
index 0000000000000000000000000000000000000000..68c8f7c694e628835e4824f18fb36e394a60470a
GIT binary patch
literal 711
zcmeAS@N?(olHy`uVBq!ia0y~yV2}i14mJh`h9fUqlNlHo*pj^6T^PXNr}OT51_lPs
z0*}aI1_nK45N51cYG1~{z`$PO>Fdh=m|0##MdDRy&q<ImC9V-A&iT2ysd*&~&PAz-
zC8;S2<(VZJ3hti10pX2&;tUK-`kpS1As)w<PV>zZb`)sc|IXrulHm-U00H~kZ}xI1
z?Q|4-bEB~PiQR?=GLcHDhXoxbNEE1u{AX27Gn(8QzqqI}ZG*Gt+L`NCt_zR-x~iJ#
zwD*OMS<f9725M((Gpu2J?cjZ0<v&ZOH-ihKNh6;D%eJrgu53S1?-6h%_km@Ai0j0l
zE!wfsW)Igf@FoaXOk|kEk>P*eELHj)(*{PHuMB)IrskNfYH;$M_+InSzccZ!CW;It
zjdBKz%MSFax-4c|u=0eQq`R?}=+Qedml*3_{}tM?&7qe|%$DWc5_^NA{}bNuH`*Dn
z^(}qP^gJnn>D1zzjv@RxjOl8wuMe<(xa<1gdsp`s=LeHJHmJr6a$H=xg1M&DG$Z@?
zMwP7>)0|)1F`bW*|9kgf8LRJex4HM$-ky3sY|*RQgoxvdrq0fB>yv%3-1lH#x-Um!
z;+2=O2eQ2%#@vx()OY4k&vS3rDq^@N`FG+M)(`g>_lSOWJ7983Ls+z);kVu<yAQk;
zx{23U?yGFj|76OxiKR$6j{k~$HCx6Sg(CJKkLi*P<_FS$N-T-vG(Gzx!o+6Y=a_pR
z*$+&W(KlKA_Q#!zpZu+~Y+k>KX$W6tDBd?UVp7wTU7cd3-b%-pW+>e5WM8pMQusnh
z;N0C(Kb5|x6i1dZU60*g=I(5HYkO@{#Fb)GjcGgmPwB0n=JA2WB5?6n*UODrlS2Q7
z=oH7g^)BN(&3>uh<$d-<we{U4Q{xx4<@rqczedY7ERQksC0AFxXkjiWL3+CSxvX<a
GXaWE_qah{$

literal 0
HcmV?d00001

diff --git a/Servers/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp
index 3db3b59d68..f46b6732ad 100644
--- a/Servers/WindowServer/WSWindowManager.cpp
+++ b/Servers/WindowServer/WSWindowManager.cpp
@@ -167,6 +167,7 @@ WSWindowManager::WSWindowManager()
     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_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 = 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
 {
+    if (m_drag_window)
+        return *m_move_cursor;
+
     if (m_resize_window) {
         switch (m_resize_direction) {
         case ResizeDirection::Up:
diff --git a/Servers/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h
index e062d658cb..84bcb990e6 100644
--- a/Servers/WindowServer/WSWindowManager.h
+++ b/Servers/WindowServer/WSWindowManager.h
@@ -164,6 +164,7 @@ private:
     RetainPtr<WSCursor> m_resize_diagonally_bltr_cursor;
     RetainPtr<WSCursor> m_i_beam_cursor;
     RetainPtr<WSCursor> m_disallowed_cursor;
+    RetainPtr<WSCursor> m_move_cursor;
 
     OwnPtr<Painter> m_back_painter;
     OwnPtr<Painter> m_front_painter;