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:
authorCampbell Barton <ideasman42@gmail.com>2013-10-02 20:13:24 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-10-02 20:13:24 +0400
commit592443816dc5b5473f5092d79dfcdf552023631d (patch)
treee82b1242371b8d938f3b8b644c60095d52631744
parent4bc998d0b3487732712c44848702fd9eaf2fd11e (diff)
re-shuffle ifdef for osx to make it more clear
-rw-r--r--source/blender/editors/interface/interface_handlers.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 2d7a86721d9..dbaa30d01c2 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -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,