re-shuffle ifdef for osx to make it more clear
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 Oct 2013 16:13:24 +0000 (16:13 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 Oct 2013 16:13:24 +0000 (16:13 +0000)
source/blender/editors/interface/interface_handlers.c

index 2d7a86721d99318ef66301a0bf84cc19ff1000a0..dbaa30d01c28b3a90ac985fe166d3aa5cde43aa4 100644 (file)
@@ -2227,12 +2227,16 @@ static void ui_do_but_textedit(bContext *C, uiBlock *block, uiBut *but, uiHandle
                                break;
                                
                        case AKEY:
+
                                /* Ctrl + A: Select all */
-#if !defined(__APPLE__)
-                               if (event->ctrl && !(event->alt || event->shift || event->oskey)) {
-#else                  /* OSX uses cmd-a systemwide, so add it */
-                               if ((event->oskey && !(event->alt || event->shift || event->ctrl)) || (event->ctrl && !(event->alt || event->shift || event->oskey))) {
+#if defined(__APPLE__)
+                               /* OSX uses cmd-a systemwide, so add it */
+                               if ((event->oskey && !(event->alt || event->shift || event->ctrl)) ||
+                                   (event->ctrl  && !(event->alt || event->shift || event->oskey)))
+#else
+                               if (event->ctrl && !(event->alt || event->shift || event->oskey))
 #endif
+                               {
                                        ui_textedit_move(but, data, STRCUR_DIR_PREV,
                                                         false, STRCUR_JUMP_ALL);
                                        ui_textedit_move(but, data, STRCUR_DIR_NEXT,