griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

re-shuffle ifdef for osx to make it more clear

Browse Source
This commit is contained in:
Campbell Barton
2013-10-02 16:13:24 +00:00
parent 4bc998d0b3
commit 592443816d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/interface/interface_handlers.c
View 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,