[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31531] trunk/blender/source/blender/ editors/space_outliner/outliner.c: Patch #23460: Fix for Outliner; excludes expand button from renaming an object

[Joshua Leung]

Revision: 31531
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31531
Author:   aligorith
Date:     2010-08-23 13:03:48 +0200 (Mon, 23 Aug 2010)

Log Message:
-----------
Patch #23460: Fix for Outliner; excludes expand button from renaming an object
Submitted by: Alexander Kuznetsov (alexk) 

Ctrl-LMB or Double-Click over the expand buttons in the Outliner would try renaming the object/item, but in 2.4x this only happened over the name.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_outliner/outliner.c

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-08-23 10:46:31 UTC (rev 31530)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2010-08-23 11:03:48 UTC (rev 31531)
@@ -2402,7 +2402,7 @@
 			return 1;
 		}
 		/* name and first icon */
-		else if(mval[0]>te->xs && mval[0]<te->xend) {
+		else if(mval[0]>te->xs+OL_X && mval[0]<te->xend) {
 			
 			/* always makes active object */
 			if(tselem->type!=TSE_SEQUENCE && tselem->type!=TSE_SEQ_STRIP && tselem->type!=TSE_SEQUENCE_DUP)
@@ -2599,7 +2599,7 @@
 		TreeStoreElem *tselem= TREESTORE(te);
 		
 		/* name and first icon */
-		if(mval[0]>te->xs && mval[0]<te->xend) {
+		if(mval[0]>te->xs+OL_X && mval[0]<te->xend) {
 			
 			/* can't rename rna datablocks entries */
 			if(ELEM3(tselem->type, TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM))