[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20485] branches/blender2.5/blender: UI: Matt, check space_outliner.c diff to see how to get python

Brecht Van Lommel brecht at blender.org
Fri May 29 01:58:18 CEST 2009


Revision: 20485
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20485
Author:   blendix
Date:     2009-05-29 01:58:18 +0200 (Fri, 29 May 2009)

Log Message:
-----------
UI: Matt, check space_outliner.c diff to see how to get python
layouts in a header.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/space_outliner.py
    branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c
    branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c

Modified: branches/blender2.5/blender/release/ui/space_outliner.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_outliner.py	2009-05-28 23:48:29 UTC (rev 20484)
+++ branches/blender2.5/blender/release/ui/space_outliner.py	2009-05-28 23:58:18 UTC (rev 20485)
@@ -16,7 +16,7 @@
 			row.itemM(context, "OUTLINER_MT_view")
 			
 		row = layout.row(align=True)
-		row.itemR(so, "display_mode")
+		row.itemR(so, "display_mode", text="")
 
 class OUTLINER_MT_view(bpy.types.Menu):
 	__space_type__ = "OUTLINER"

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c	2009-05-28 23:48:29 UTC (rev 20484)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c	2009-05-28 23:58:18 UTC (rev 20485)
@@ -655,7 +655,7 @@
 	subtype= RNA_property_subtype(prop);
 	len= RNA_property_array_length(prop);
 
-	if(type == PROP_STRING)
+	if(ELEM(type, PROP_STRING, PROP_ENUM))
 		w += 10*UI_UNIT_X;
 
 	/* increase height for arrays */

Modified: branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c	2009-05-28 23:48:29 UTC (rev 20484)
+++ branches/blender2.5/blender/source/blender/editors/space_outliner/space_outliner.c	2009-05-28 23:58:18 UTC (rev 20485)
@@ -143,14 +143,23 @@
 
 /* ************************ header outliner area region *********************** */
 
+//#define PY_HEADER
+
 /* add handlers, stuff you only do once or on area/region changes */
 static void outliner_header_area_init(wmWindowManager *wm, ARegion *ar)
 {
+#ifdef PY_HEADER
+	ED_region_header_init(ar);
+#else
 	UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_HEADER, ar->winx, ar->winy);
+#endif
 }
 
 static void outliner_header_area_draw(const bContext *C, ARegion *ar)
 {
+#ifdef PY_HEADER
+	ED_region_header(C, ar);
+#else
 	float col[3];
 	
 	if(ED_screen_area_active(C))
@@ -165,6 +174,7 @@
 	UI_view2d_view_ortho(C, &ar->v2d);
 
 	outliner_header_buttons(C, ar);
+#endif
 }
 
 static void outliner_header_area_free(ARegion *ar)





More information about the Bf-blender-cvs mailing list