[Scummvm-git-logs] scummvm master -> 85b0baa199832f0ddd28dcf20c35eacef2f1a780

[aquadran]

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:
85b0baa199 SDL: Sync portion code for 2D->3D gfx manager (#2515)


Commit: 85b0baa199832f0ddd28dcf20c35eacef2f1a780
    https://github.com/scummvm/scummvm/commit/85b0baa199832f0ddd28dcf20c35eacef2f1a780
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-13T17:31:47+02:00

Commit Message:
SDL: Sync portion code for 2D->3D gfx manager (#2515)

Changed paths:
    backends/graphics3d/sdl/sdl-graphics3d.cpp
    backends/graphics3d/sdl/sdl-graphics3d.h


diff --git a/backends/graphics3d/sdl/sdl-graphics3d.cpp b/backends/graphics3d/sdl/sdl-graphics3d.cpp
index ef3001e65f..c3a3284ac0 100644
--- a/backends/graphics3d/sdl/sdl-graphics3d.cpp
+++ b/backends/graphics3d/sdl/sdl-graphics3d.cpp
@@ -105,6 +105,10 @@ bool SdlGraphics3dManager::notifyEvent(const Common::Event &event) {
 	}
 
 	switch ((CustomEventAction) event.customType) {
+	case kActionToggleMouseCapture:
+		getWindow()->toggleMouseGrab();
+		return true;
+
 	case kActionToggleFullscreen:
 		toggleFullScreen();
 		return true;
@@ -139,11 +143,23 @@ Common::Keymap *SdlGraphics3dManager::getKeymap() {
 		keymap->addAction(act);
 	}
 
+	act = new Action("CAPT", _("Toggle mouse capture"));
+	act->addDefaultInputMapping("C+m");
+	act->setCustomBackendActionEvent(kActionToggleMouseCapture);
+	keymap->addAction(act);
+
 	act = new Action("SCRS", _("Save screenshot"));
 	act->addDefaultInputMapping("A+s");
 	act->setCustomBackendActionEvent(kActionSaveScreenshot);
 	keymap->addAction(act);
 
+	if (hasFeature(OSystem::kFeatureAspectRatioCorrection)) {
+		act = new Action("ASPT", _("Toggle aspect ratio correction"));
+		act->addDefaultInputMapping("C+A+a");
+		act->setCustomBackendActionEvent(kActionToggleAspectRatioCorrection);
+		keymap->addAction(act);
+	}
+
 	return keymap;
 }
 
diff --git a/backends/graphics3d/sdl/sdl-graphics3d.h b/backends/graphics3d/sdl/sdl-graphics3d.h
index b83cdd2eeb..dbc4a999d5 100644
--- a/backends/graphics3d/sdl/sdl-graphics3d.h
+++ b/backends/graphics3d/sdl/sdl-graphics3d.h
@@ -101,7 +101,7 @@ public:
 	virtual bool notifyMousePosition(Common::Point &mouse);
 
 	virtual bool showMouse(bool visible) override;
-	virtual bool lockMouse(bool lock) override; 
+	virtual bool lockMouse(bool lock) override;
 
 	virtual bool saveScreenshot(const Common::String &filename) const { return false; }
 	void saveScreenshot() override;
@@ -136,7 +136,9 @@ public:
 protected:
 	enum CustomEventAction {
 		kActionToggleFullscreen = 100,
-		kActionSaveScreenshot
+		kActionToggleMouseCapture,
+		kActionSaveScreenshot,
+		kActionToggleAspectRatioCorrection
 	};
 
 protected: