[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60504] trunk/blender/source/blender/ editors/interface/interface_handlers.c: OSX: readd ctrl-a for 'select all' in text(-boxes) against my own conviction for now - really to be discussed

[jens verwiebe]

Revision: 60504
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60504
Author:   jensverwiebe
Date:     2013-10-02 16:09:09 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
OSX: readd ctrl-a for 'select all' in text(-boxes) against my own conviction for now - really to be discussed

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-10-02 15:35:31 UTC (rev 60503)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-10-02 16:09:09 UTC (rev 60504)
@@ -2230,8 +2230,8 @@
 				/* Ctrl + A: Select all */
 #if !defined(__APPLE__)
 				if (event->ctrl && !(event->alt || event->shift || event->oskey)) {
-#else
-				if (event->oskey && !(event->alt || event->shift || event->ctrl)) { // OSX conformity
+#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))) {
 #endif
 					ui_textedit_move(but, data, STRCUR_DIR_PREV,
 					                 false, STRCUR_JUMP_ALL);