This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit 7356f67b78fde6063d5ba40d31c9c86f123d976d
Author: MBlanc <manuel.bl...@estudiante.uam.es>
Date: Wed Dec 10 09:56:10 2014 +0100
Shortcuts now use the meta key on OSX
---
src/ui/edit.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp
index 1e55705..736a11f 100644
--- a/src/ui/edit.cpp
+++ b/src/ui/edit.cpp
@@ -28,6 +28,7 @@
#include "object/level/parserparam.h"
+#include "common/config.h"
#include "common/resources/inputstream.h"
#include "common/resources/outputstream.h"
@@ -303,7 +304,11 @@ bool CEdit::EventProcess(const Event &event)
if ( event.type == EVENT_KEY_DOWN && m_bFocus )
{
bShift = ( (event.kmodState & KEY_MOD(SHIFT) ) != 0 );
+ #if PLATFORM_MACOSX
+ bControl = ( (event.kmodState & KEY_MOD(META) ) != 0);
+ #else
bControl = ( (event.kmodState & KEY_MOD(CTRL) ) != 0);
+ #endif
if ( (event.key.key == KEY(x) && !bShift && bControl) ||
(event.key.key == KEY(DELETE) && bShift && !bControl) )
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
