Răsfoiți Sursa

Merge pull request #21741 from capnm/fix-custom-cursor-hotspot

Really fix the custom cursor hotspot
Rémi Verschelde 7 ani în urmă
părinte
comite
a1b578562a
3 a modificat fișierele cu 3 adăugiri și 0 ștergeri
  1. 1 0
      platform/osx/os_osx.mm
  2. 1 0
      platform/windows/os_windows.cpp
  3. 1 0
      platform/x11/os_x11.cpp

+ 1 - 0
platform/osx/os_osx.mm

@@ -1604,6 +1604,7 @@ void OS_OSX::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c
 		}
 
 		ERR_FAIL_COND(!texture.is_valid());
+		ERR_FAIL_COND(p_hotspot.x < 0 || p_hotspot.y < 0);
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
 		ERR_FAIL_COND(p_hotspot.x > texture_size.width || p_hotspot.y > texture_size.height);
 

+ 1 - 0
platform/windows/os_windows.cpp

@@ -2252,6 +2252,7 @@ void OS_Windows::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shap
 		}
 
 		ERR_FAIL_COND(!texture.is_valid());
+		ERR_FAIL_COND(p_hotspot.x < 0 || p_hotspot.y < 0);
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
 		ERR_FAIL_COND(p_hotspot.x > texture_size.width || p_hotspot.y > texture_size.height);
 

+ 1 - 0
platform/x11/os_x11.cpp

@@ -2534,6 +2534,7 @@ void OS_X11::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c
 		}
 
 		ERR_FAIL_COND(!texture.is_valid());
+		ERR_FAIL_COND(p_hotspot.x < 0 || p_hotspot.y < 0);
 		ERR_FAIL_COND(texture_size.width > 256 || texture_size.height > 256);
 		ERR_FAIL_COND(p_hotspot.x > texture_size.width || p_hotspot.y > texture_size.height);