UI
authorWilliam Reynish <william@reynish.com>
Sun, 23 Aug 2009 21:56:32 +0000 (21:56 +0000)
committerWilliam Reynish <william@reynish.com>
Sun, 23 Aug 2009 21:56:32 +0000 (21:56 +0000)
Changed the rounding of action buttons. The round style looked pleasing when they were isolated, viewed by themselves, but looked terrible when grouped, or at small sizes with icons as it was often used. The old Filebrowse or Render This Window buttons were examples of how badly they looked with an icon, and the rounding in the tools area made for some weird visual shapes. When combined in groups of widgets, such as the datablock selectors it looked even weirder, because one side of the group would be square and the other would be round, causing some spatial clashes.

http://www.reynish.com/files/blender25/actionbuttons_new.png

Also tweaked the tools sub-area color which stood out as being much brighter than the rest of the UI. When the tools area was open in the default layout, the overall impression was asymmetrical, non-harmonic.

source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_modifier.c

index 48de2343c9778e86f8b804f9fb8346b60e5dfd3e..ba0d1900344de5ee021b2dde3bad0333f9192a72 100644 (file)
@@ -1085,7 +1085,7 @@ static struct uiWidgetColors wcol_tool= {
        {255, 255, 255, 255},
        
        1,
-       25, -25
+       15, -15
 };
 
 static struct uiWidgetColors wcol_box= {
@@ -1897,7 +1897,7 @@ static void widget_swatch(uiBut *but, uiWidgetColors *wcol, rcti *rect, int stat
        widget_init(&wtb);
        
        /* half rounded */
-       round_box_edges(&wtb, roundboxalign, rect, 4.0f);
+       round_box_edges(&wtb, roundboxalign, rect, 5.0f);
                
        ui_get_but_vectorf(but, col);
        wcol->inner[0]= FTOCHAR(col[0]);
@@ -1916,7 +1916,7 @@ static void widget_textbut(uiWidgetColors *wcol, rcti *rect, int state, int roun
        widget_init(&wtb);
        
        /* half rounded */
-       round_box_edges(&wtb, roundboxalign, rect, 5.0f);
+       round_box_edges(&wtb, roundboxalign, rect, 4.0f);
        
        widgetbase_draw(&wtb, wcol);
 
@@ -1950,8 +1950,8 @@ static void widget_pulldownbut(uiWidgetColors *wcol, rcti *rect, int state, int
                
                widget_init(&wtb);
                
-               /* fully rounded */
-               round_box_edges(&wtb, 15, rect, rad);
+               /* half rounded */
+               round_box_edges(&wtb, 15, rect, 4.0f);
                
                widgetbase_draw(&wtb, wcol);
        }
@@ -2049,8 +2049,8 @@ static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int state, int rou
        
        widget_init(&wtb);
        
-       /* fully rounded */
-       round_box_edges(&wtb, roundboxalign, rect, rad);
+       /* half rounded */
+       round_box_edges(&wtb, roundboxalign, rect, 4.0f);
 
        widgetbase_draw(&wtb, wcol);
 }
index 5b51d898235dc74e73d0a73db25b7e008cffa7ad..8aaede7515a9dcad5f7970afdd323498fbfdb370 100644 (file)
@@ -445,6 +445,7 @@ void ui_theme_init_userdef(void)
        SETCOL(btheme->tv3d.text_hi, 255, 255, 255, 255);
        
        SETCOLF(btheme->tv3d.header,    0.45, 0.45, 0.45, 1.0);
+       SETCOLF(btheme->tv3d.button,    0.45, 0.45, 0.45, 1.0);
        SETCOL(btheme->tv3d.panel,      165, 165, 165, 127);
        
        SETCOL(btheme->tv3d.shade1,  160, 160, 160, 100);
index bfd93a4218b331e794d342675e70a5847c5b8e59..4845ad28d47a129e213dd0547f532bcff3c9edb1 100644 (file)
@@ -55,7 +55,7 @@ EnumPropertyItem modifier_type_items[] ={
        {eModifierType_Multires, "MULTIRES", ICON_MOD_MULTIRES, "Multiresolution", ""},
        {eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""},
        {eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV Project", ""},
-       {0, "", 0, "Deformers", ""},
+       {0, "", 0, "Deform", ""},
        {eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""},
        {eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""},
        {eModifierType_Curve, "CURVE", ICON_MOD_CURVE, "Curve", ""},