Revision: 20917
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20917
Author: gsrb3d
Date: 2009-06-16 04:40:39 +0200 (Tue, 16 Jun 2009)
Log Message:
-----------
Separate "content reordering" from "plain menus".
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface.c
branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-06-16 01:51:51 UTC (rev 20916)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface.c
2009-06-16 02:40:39 UTC (rev 20917)
@@ -2850,8 +2850,8 @@
uiBut *but, *next;
float centy, miny=10000, maxy= -10000;
- /*if(U.uiflag & USER_PLAINMENUS)
- return;*/
+ if(!(U.uiflag & USER_DIRECTIONALORDER))
+ return;
for(but= block->buttons.first; but; but= but->next) {
if(but->flag & UI_BUT_ALIGN) return;
Modified:
branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
2009-06-16 01:51:51 UTC (rev 20916)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
2009-06-16 02:40:39 UTC (rev 20917)
@@ -378,6 +378,7 @@
#define USER_ZOOM_TO_MOUSEPOS (1 << 20)
#define USER_SHOW_FPS (1 << 21)
#define USER_MMB_PASTE (1 << 22)
+#define USER_DIRECTIONALORDER (1 << 23)
/* Auto-Keying mode */
/* AUTOKEY_ON is a bitflag */
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
2009-06-16 01:51:51 UTC (rev 20916)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
2009-06-16 02:40:39 UTC (rev 20917)
@@ -1476,8 +1476,12 @@
prop= RNA_def_property(srna, "use_column_layout", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_PLAINMENUS);
- RNA_def_property_ui_text(prop, "Toolbox Column Layout", "Use a column
layout for toolbox and do not flip the contents of any menu.");
+ RNA_def_property_ui_text(prop, "Toolbox Column Layout", "Use a column
layout for toolbox.");
+ prop= RNA_def_property(srna, "directional_menus", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "uiflag",
USER_DIRECTIONALORDER);
+ RNA_def_property_ui_text(prop, "Contents Follow Opening Direction",
"Otherwise menus, etc will always be top to bottom, left to right, no matter
opening direction.");
+
/* snap to grid */
prop= RNA_def_property(srna, "snap_translate", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOGRABGRID);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
