[Scummvm-git-logs] scummvm master -> ef7edf95d12902622757d2bd4ff917afaf97e2bd

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ef7edf95d1 GRAPHICS: MACGUI: Allow specifying a custom cursor using Graphics::Cursor


Commit: ef7edf95d12902622757d2bd4ff917afaf97e2bd
    https://github.com/scummvm/scummvm/commit/ef7edf95d12902622757d2bd4ff917afaf97e2bd
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-05-09T09:40:38+02:00

Commit Message:
GRAPHICS: MACGUI: Allow specifying a custom cursor using Graphics::Cursor

Changed paths:
    graphics/macgui/macwindowmanager.cpp
    graphics/macgui/macwindowmanager.h


diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 1e7a79f4f8..0a55d6c6b6 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -529,6 +529,16 @@ void MacWindowManager::pushCustomCursor(const byte *data, int w, int h, int hx,
 	CursorMan.pushCursorPalette(cursorPalette, 0, 2);
 }
 
+void MacWindowManager::pushCustomCursor(const Graphics::Cursor *cursor) {
+	CursorMan.pushCursor(cursor->getSurface(), cursor->getWidth(), cursor->getHeight(), cursor->getHotspotX(),
+	                     cursor->getHotspotY(), cursor->getKeyColor());
+
+	if (cursor->getPalette())
+		CursorMan.pushCursorPalette(cursor->getPalette(), cursor->getPaletteStartIndex(), cursor->getPaletteCount());
+	else
+		CursorMan.pushCursorPalette(cursorPalette, 0, 2);
+}
+
 void MacWindowManager::popCursor() {
 	CursorMan.popCursor();
 	CursorMan.popCursorPalette();
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index 8c4749aa2a..e222b21d05 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -69,6 +69,8 @@ enum {
 }
 using namespace MacGUIConstants;
 
+class Cursor;
+
 class ManagedSurface;
 
 class MacMenu;
@@ -226,6 +228,7 @@ public:
 	void pushCrossBarCursor();
 	void pushWatchCursor();
 	void pushCustomCursor(const byte *data, int w, int h, int hx, int hy, int transcolor);
+	void pushCustomCursor(const Graphics::Cursor *cursor);
 	void popCursor();
 
 	void pauseEngine(bool pause);