Skip to content

Commit 73b0ff2

Browse files
committed
FlxMouse: add registerSimpleNativeCursorData()
Does the same as setSimpleNativeCursorData(), but doesn't activate the cursor. Allows fixing #1944 without introducing redundant code.
1 parent ed4c344 commit 73b0ff2

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

flixel/input/mouse/FlxMouse.hx

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ class FlxMouse extends FlxPointer implements IFlxInputManager
261261
}
262262

263263
/**
264-
* Shortcut to register a native cursor for in flash
264+
* Shortcut to register a native cursor in flash
265265
*
266266
* @param Name The ID name used for the cursor
267267
* @param CursorData MouseCursorData contains the bitmap, hotspot etc
@@ -273,32 +273,41 @@ class FlxMouse extends FlxPointer implements IFlxInputManager
273273
}
274274

275275
/**
276-
* Shortcut to create and set a simple MouseCursorData
276+
* Shortcut to register a simple MouseCursorData
277277
*
278278
* @param Name The ID name used for the cursor
279279
* @param CursorData MouseCursorData contains the bitmap, hotspot etc
280280
*/
281-
public function setSimpleNativeCursorData(Name:String, CursorBitmap:BitmapData):MouseCursorData
281+
public function registerSimpleNativeCursorData(Name:String, CursorBitmap:BitmapData):MouseCursorData
282282
{
283283
var cursorVector = new Vector<BitmapData>();
284284
cursorVector[0] = CursorBitmap;
285285

286286
if (CursorBitmap.width > 32 || CursorBitmap.height > 32)
287-
{
288287
throw "BitmapData files used for native cursors cannot exceed 32x32 pixels due to an OS limitation.";
289-
}
290288

291289
var cursorData = new MouseCursorData();
292290
cursorData.hotSpot = new Point(0, 0);
293291
cursorData.data = cursorVector;
294292

295293
registerNativeCursor(Name, cursorData);
296-
setNativeCursor(Name);
297-
298-
Mouse.show();
299294

300295
return cursorData;
301296
}
297+
298+
/**
299+
* Shortcut to create and set a simple MouseCursorData
300+
*
301+
* @param Name The ID name used for the cursor
302+
* @param CursorData MouseCursorData contains the bitmap, hotspot etc
303+
*/
304+
public function setSimpleNativeCursorData(Name:String, CursorBitmap:BitmapData):MouseCursorData
305+
{
306+
var data = registerSimpleNativeCursorData(Name, CursorBitmap);
307+
setNativeCursor(Name);
308+
Mouse.show();
309+
return data;
310+
}
302311
#end
303312

304313
/**

flixel/system/debug/interaction/tools/Mover.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class GraphicMoverTool extends BitmapData {}
1515
* @author Fernando Bevilacqua (dovyski@gmail.com)
1616
*/
1717
class Mover extends Tool
18-
{
18+
{
1919
private var _dragging:Bool = false;
2020
private var _lastCursorPosition:FlxPoint;
2121

0 commit comments

Comments
 (0)