Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2010-01-15 09:17:28 +0300
committerMatt Ebb <matt@mke3.net>2010-01-15 09:17:28 +0300
commitbd6ce45ef48abaa43e14a41d988ad3c42a485261 (patch)
tree5f238764f60e5f2e0f699002b745a064a1624b55 /source/blender/windowmanager
parent87c5ed37a5aee2b9d5db3408add9d9254f032b3f (diff)
Fix [#20129] emulate numpad
Converted Command+LMB to send a RMB click event on Mac OS X, if Emulate 3 Button Mouse is switched on. Also fixes for previous commit, didn't all go through.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 775d8c2b4ab..15adb33d527 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -781,6 +781,16 @@ static void wm_eventemulation(wmEvent *event)
}
}
+#ifdef __APPLE__
+ /* rightmouse emulation */
+ if(U.flag & USER_TWOBUTTONMOUSE) {
+ if(event->type == LEFTMOUSE && event->oskey) {
+ event->type = RIGHTMOUSE;
+ event->oskey = 0;
+ }
+ }
+#endif
+
/* numpad emulation */
if(U.flag & USER_NONUMPAD) {
switch(event->type) {