[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20626] branches/blender2.5/blender/source /blender/editors: 2.5

[Ton Roosendaal]

Revision: 20626
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20626
Author:   ton
Date:     2009-06-04 16:32:10 +0200 (Thu, 04 Jun 2009)

Log Message:
-----------
2.5

Two small fixes;
- Search menu options text could overlap with hotkey
- Operator "duplicate area into window" didnt work for non-actionzone

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
    branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-06-04 14:11:39 UTC (rev 20625)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c	2009-06-04 14:32:10 UTC (rev 20626)
@@ -1951,7 +1951,7 @@
 	cpoin= strchr(name, '|');
 	if(cpoin) {
 		*cpoin= 0;
-		rect->xmax -= BLF_width(cpoin+1) -10;
+		rect->xmax -= BLF_width(cpoin+1) + 10;
 	}
 	
 	glColor3ubv(wt->wcol.text);

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2009-06-04 14:11:39 UTC (rev 20625)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2009-06-04 14:32:10 UTC (rev 20626)
@@ -608,18 +608,25 @@
 	bScreen *newsc, *sc;
 	ScrArea *sa;
 	rcti rect;
-	sActionzoneData *sad= event->customdata;
-
-	if(sad==NULL)
-		return OPERATOR_PASS_THROUGH;
 	
 	win= CTX_wm_window(C);
 	sc= CTX_wm_screen(C);
-	sa= sad->sa1;
+	sa= CTX_wm_area(C);
+	
+	/* XXX hrmf! */
+	if(event->type==EVT_ACTIONZONE_AREA) {
+		sActionzoneData *sad= event->customdata;
 
+		if(sad==NULL)
+			return OPERATOR_PASS_THROUGH;
+	
+		sa= sad->sa1;
+	}
+	
 	/*  poll() checks area context, but we don't accept full-area windows */
 	if(sc->full != SCREENNORMAL) {
-		actionzone_exit(C, op);
+		if(event->type==EVT_ACTIONZONE_AREA)
+			actionzone_exit(C, op);
 		return OPERATOR_CANCELLED;
 	}
 	
@@ -638,7 +645,8 @@
 	/* screen, areas init */
 	WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
 
-	actionzone_exit(C, op);
+	if(event->type==EVT_ACTIONZONE_AREA)
+		actionzone_exit(C, op);
 	
 	return OPERATOR_FINISHED;
 }