[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35964] trunk/blender/source/blender/ editors/interface/interface_utils.c: Committing patch [#26740] Interface improvement for toolbar by Brecht.

[Thomas Dinges]

Revision: 35964
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35964
Author:   dingto
Date:     2011-04-02 16:45:17 +0000 (Sat, 02 Apr 2011)
Log Message:
-----------
Committing patch [#26740] Interface improvement for toolbar by Brecht. Thanks!

This patch makes the bool properties inside the toolshelf more compact, only 1 
row per item now. :)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_utils.c

Modified: trunk/blender/source/blender/editors/interface/interface_utils.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_utils.c    
2011-04-02 16:29:33 UTC (rev 35963)
+++ trunk/blender/source/blender/editors/interface/interface_utils.c    
2011-04-02 16:45:17 UTC (rev 35964)
@@ -145,17 +145,23 @@
                        continue;
 
                if(label_align != '\0') {
+                       PropertyType type = RNA_property_type(prop);
+                       int is_boolean = (type == PROP_BOOLEAN && 
!RNA_property_array_check(ptr, prop));
+
                        name= RNA_property_ui_name(prop);
 
                        if(label_align=='V') {
                                col= uiLayoutColumn(layout, 1);
-                               uiItemL(col, name, ICON_NONE);
+
+                               if(!is_boolean)
+                                       uiItemL(col, name, ICON_NONE);
                        }
                        else if(label_align=='H') {
                                split = uiLayoutSplit(layout, 0.5f, 0);
 
-                               uiItemL(uiLayoutColumn(split, 0), name, 
ICON_NONE);
                                col= uiLayoutColumn(split, 0);
+                               uiItemL(col, (is_boolean)? "": name, ICON_NONE);
+                               col= uiLayoutColumn(split, 0);
                        }
                        else {
                                col= NULL;
@@ -163,12 +169,9 @@
 
                        /* may meed to add more cases here.
                         * don't override enum flag names */
-                       if(flag & PROP_ENUM_FLAG) {
-                               name= NULL;
-                       }
-                       else {
-                               name= ""; /* name is shown above, empty name 
for button below */
-                       }
+
+                       /* name is shown above, empty name for button below */
+                       name= (flag & PROP_ENUM_FLAG || is_boolean)? NULL: "";
                }
                else {
                        col= layout;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs