[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49788] trunk/blender/source/blender/ editors: fix for minor UI annoyance - when the window is fullscreen now dont draw area corners since areas cant be split when fullscreen .

Campbell Barton ideasman42 at gmail.com
Sat Aug 11 02:05:58 CEST 2012


Revision: 49788
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49788
Author:   campbellbarton
Date:     2012-08-11 00:05:57 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
fix for minor UI annoyance - when the window is fullscreen now dont draw area corners since areas cant be split when fullscreen.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/ED_screen_types.h
    trunk/blender/source/blender/editors/screen/area.c

Modified: trunk/blender/source/blender/editors/include/ED_screen_types.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_screen_types.h	2012-08-10 23:03:17 UTC (rev 49787)
+++ trunk/blender/source/blender/editors/include/ED_screen_types.h	2012-08-11 00:05:57 UTC (rev 49788)
@@ -98,7 +98,7 @@
 } AZone;
 
 /* actionzone type */
-#define AZONE_AREA          1
-#define AZONE_REGION        2
+#define AZONE_AREA      1  /* corner widgets for splitting areas */
+#define AZONE_REGION    2  /* when a region is collapsed, draw a handle to expose */
 
 #endif /* __ED_SCREEN_TYPES_H__ */

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c	2012-08-10 23:03:17 UTC (rev 49787)
+++ trunk/blender/source/blender/editors/screen/area.c	2012-08-11 00:05:57 UTC (rev 49788)
@@ -167,6 +167,9 @@
 	}
 }
 
+/**
+ * \brief Corner widgets use for dragging and splitting the view.
+ */
 static void area_draw_azone(short x1, short y1, short x2, short y2)
 {
 	int dx = x2 - x1;
@@ -592,13 +595,17 @@
 /* ************************************************************ */
 
 
-static void area_azone_initialize(ScrArea *sa) 
+static void area_azone_initialize(bScreen *screen, ScrArea *sa)
 {
 	AZone *az;
 	
 	/* reinitalize entirely, regions add azones too */
 	BLI_freelistN(&sa->actionzones);
-	
+
+	if (screen->full != SCREENNORMAL) {
+		return;
+	}
+
 	/* set area action zones */
 	az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
 	BLI_addtail(&(sa->actionzones), az);
@@ -1219,7 +1226,7 @@
 	area_calc_totrct(sa, win->sizex, win->sizey);
 	
 	/* clear all azones, add the area triange widgets */
-	area_azone_initialize(sa);
+	area_azone_initialize(win->screen, sa);
 
 	/* region rect sizes */
 	rect = sa->totrct;




More information about the Bf-blender-cvs mailing list