Minor UI fixes by Emilie McDavid and Chris Burt. Mostly button alignement fixes,...

Mostly in Editing and Shading (material).

Note: broken should review the changes though we've checked with all the different draw types and it didn't make any problem. If it worked correctly on Desoto's weird screen size, it can probably work anywhere. ;)

diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index a7b2194a44997b53b3f787325954018f96c74b8f..ef949e88fd4c270727908aa5fc25656df913f102 100644 (file)
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -676,7 +676,6 @@ static void editing_panel_mesh_type(Object *ob, Mesh *me)
                uiDefBut(block, BUT, B_MAKE_TFACES, "Make",             80,30,84,19, 0, 0, 0, 0, 0, "Enables the active object's faces for UV coordinate mapping");
        }
        else uiDefBut(block, BUT, B_DEL_TFACES, "Delete",       80,30,84,19, 0, 0, 0, 0, 0, "Deletes UV coordinates for active object's faces");
-       uiBlockEndAlign(block);
 
        if(me->msticky) val= 1.0; else val= 0.0;
        uiDefBut(block, LABEL, 0, "Sticky",                             10,10,70,20, 0, val, 0, 0, 0, "");
@@ -685,6 +684,7 @@ static void editing_panel_mesh_type(Object *ob, Mesh *me)
        }
        else uiDefBut(block, BUT, B_DELSTICKY, "Delete",        80,10,84,19, 0, 0, 0, 0, 0, "Deletes Sticky texture coordinates");
 
+       uiBlockEndAlign(block);
 
        /* decimator */
        if(G.obedit==NULL) {
@@ -1445,32 +1445,32 @@ static void editing_panel_lattice_type(Object *ob, Lattice *lt)
        uiSetButLock(ob==G.obedit, "Unable to perform function in EditMode");
 
        uiBlockBeginAlign(block);
-       uiDefButS(block, NUM, B_RESIZELAT,      "U:",                           470, 178,100,19, &lt->pntsu, 1.0, 64.0, 0, 0, "Points in U direction");
+
+       uiDefButS(block, NUM, B_RESIZELAT,      "U:",                           469, 178,100,19, &lt->pntsu, 1.0, 64.0, 0, 0, "Points in U direction");
        uiDefButC(block, ROW, B_LATTCHANGED,            "Lin",          572, 178, 40, 19, &lt->typeu, 1.0, (float)KEY_LINEAR, 0, 0, "Set Linear interpolation");
-       uiDefButC(block, ROW, B_LATTCHANGED,            "Card",         612, 178, 40, 19, &lt->typeu, 1.0, (float)KEY_CARDINAL, 0, 0, "Set Cardinal interpolation");
+       uiDefButC(block, ROW, B_LATTCHANGED,            "Card",         613, 178, 40, 19, &lt->typeu, 1.0, (float)KEY_CARDINAL, 0, 0, "Set Cardinal interpolation");
        uiDefButC(block, ROW, B_LATTCHANGED,            "B",            652, 178, 40, 19, &lt->typeu, 1.0, (float)KEY_BSPLINE, 0, 0, "Set B-spline interpolation");
 
-       uiBlockBeginAlign(block);
-       uiDefButS(block, NUM, B_RESIZELAT,      "V:",                           470, 158,100,19, &lt->pntsv, 1.0, 64.0, 0, 0, "Points in V direction");
-       uiDefButC(block, ROW, B_LATTCHANGED,            "Lin",          572, 158, 40, 19, &lt->typev, 2.0, (float)KEY_LINEAR, 0, 0, "Set Linear interpolation");
-       uiDefButC(block, ROW, B_LATTCHANGED,            "Card",         612, 158, 40, 19, &lt->typev, 2.0, (float)KEY_CARDINAL, 0, 0, "Set Cardinal interpolation");
-       uiDefButC(block, ROW, B_LATTCHANGED,            "B",            652, 158, 40, 19, &lt->typev, 2.0, (float)KEY_BSPLINE, 0, 0, "Set B-spline interpolation");
+       uiDefButS(block, NUM, B_RESIZELAT,      "V:",                           469, 156,100,19, &lt->pntsv, 1.0, 64.0, 0, 0, "Points in V direction");
+       uiDefButC(block, ROW, B_LATTCHANGED,            "Lin",          572, 156, 40, 19, &lt->typev, 2.0, (float)KEY_LINEAR, 0, 0, "Set Linear interpolation");
+       uiDefButC(block, ROW, B_LATTCHANGED,            "Card",         613, 156, 40, 19, &lt->typev, 2.0, (float)KEY_CARDINAL, 0, 0, "Set Cardinal interpolation");
+       uiDefButC(block, ROW, B_LATTCHANGED,            "B",            652, 156, 40, 19, &lt->typev, 2.0, (float)KEY_BSPLINE, 0, 0, "Set B-spline interpolation");
+
+       uiDefButS(block, NUM, B_RESIZELAT,      "W:",                           469, 134,100,19, &lt->pntsw, 1.0, 64.0, 0, 0, "Points in W direction");
+       uiDefButC(block, ROW, B_LATTCHANGED,            "Lin",          572, 134, 40, 19, &lt->typew, 3.0, (float)KEY_LINEAR, 0, 0, "Set Linear interpolation");
+       uiDefButC(block, ROW, B_LATTCHANGED,            "Card",         613, 134, 40, 19, &lt->typew, 3.0, (float)KEY_CARDINAL, 0, 0, "Set Cardinal interpolation");
+       uiDefButC(block, ROW, B_LATTCHANGED,            "B",            652, 134, 40, 19, &lt->typew, 3.0, (float)KEY_BSPLINE, 0, 0, "Set B-spline interpolation");
 
-       uiBlockBeginAlign(block);
-       uiDefButS(block, NUM, B_RESIZELAT,      "W:",                           470, 138,100,19, &lt->pntsw, 1.0, 64.0, 0, 0, "Points in W direction");
-       uiDefButC(block, ROW, B_LATTCHANGED,            "Lin",          572, 138, 40, 19, &lt->typew, 3.0, (float)KEY_LINEAR, 0, 0, "Set Linear interpolation");
-       uiDefButC(block, ROW, B_LATTCHANGED,            "Card",         612, 138, 40, 19, &lt->typew, 3.0, (float)KEY_CARDINAL, 0, 0, "Set Cardinal interpolation");
-       uiDefButC(block, ROW, B_LATTCHANGED,            "B",            652, 138, 40, 19, &lt->typew, 3.0, (float)KEY_BSPLINE, 0, 0, "Set B-spline interpolation");
        uiBlockEndAlign(block);
 
-       uiDefBut(block, BUT, B_RESIZELAT,       "Make Regular",         470,101,99,32, 0, 0, 0, 0, 0, "Make Lattice regular");
+       uiDefBut(block, BUT, B_RESIZELAT,       "Make Regular",         469,98,102,31, 0, 0, 0, 0, 0, "Make Lattice regular");
 
        uiClearButLock();
-       uiDefButS(block, TOG|BIT|1, B_LATTCHANGED, "Outside",   571,101,120,31, &lt->flag, 0, 0, 0, 0, "Only draw, and take into account, the outer vertices");
+       uiDefButS(block, TOG|BIT|1, B_LATTCHANGED, "Outside",   571,98,122,31, &lt->flag, 0, 0, 0, 0, "Only draw, and take into account, the outer vertices");
 
        if(lt->key) {
-               uiDefButS(block, NUM, B_DIFF, "Slurph:",                        470,60,120,19, &(lt->key->slurph), -500.0, 500.0, 0, 0, "Set time value to denote 'slurph' (sequential delay) vertices with key framing");
-               uiDefButS(block, TOG, B_RELKEY, "Relative Keys",        470,40,120,19, &lt->key->type, 0, 0, 0, 0, "Use relative keys (instead of absolute)");
+               uiDefButS(block, NUM, B_DIFF, "Slurph:",                        469,60,120,19, &(lt->key->slurph), -500.0, 500.0, 0, 0, "Set time value to denote 'slurph' (sequential delay) vertices with key framing");
+               uiDefButS(block, TOG, B_RELKEY, "Relative Keys",        469,40,120,19, &lt->key->type, 0, 0, 0, 0, "Use relative keys (instead of absolute)");
        }
 
 }
@@ -2152,9 +2152,9 @@ static void editing_panel_links(Object *ob)
        if(ma) uiDefBut(block, LABEL, 0, ma->id.name+2, 318,153, 103, 20, 0, 0, 0, 0, 0, "");
 
        uiBlockBeginAlign(block);
-       if(ma) uiDefButF(block, COL, B_REDR, "",                        291,123,24,30, &(ma->r), 0, 0, 0, 0, "");
-       uiDefButC(block, NUM, B_REDR,   str,            318,123,103,30, &ob->actcol, min, (float)(ob->totcol), 0, 0, "Displays total number of material indices and the current index");
-       uiDefBut(block, BUT,B_MATWICH,  "?",            423,123,31,30, 0, 0, 0, 0, 0, "In EditMode, sets the active material index from selected faces");
+       if(ma) uiDefButF(block, COL, B_REDR, "",                        292,123,31,30, &(ma->r), 0, 0, 0, 0, "");
+       uiDefButC(block, NUM, B_REDR,   str,            324,123,100,30, &ob->actcol, min, (float)(ob->totcol), 0, 0, "Displays total number of material indices and the current index");
+       uiDefBut(block, BUT,B_MATWICH,  "?",            424,123,30,30, 0, 0, 0, 0, 0, "In EditMode, sets the active material index from selected faces");
 
        uiBlockBeginAlign(block);
        uiDefBut(block, BUT,B_MATNEW,   "New",          292,98,80,20, 0, 0, 0, 0, 0, "Adds a new Material index");

diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 6174e6e029f7d0b7841ec1a2141974586b0a9241..0cf4f9b7a7d75996bdda7f41eba826335e35bb14 100644 (file)
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -1330,7 +1330,7 @@ static void texture_panel_texture(MTex *mtex, Material *ma, World *wrld, Lamp *l
        }
        else {
                // label to avoid centering
-               uiDefBut(block, LABEL, 0, " ",  240, 10, 70, 20, 0, 0, 0, 0, 0, "");
+               uiDefBut(block, LABEL, 0, " ",  160, 10, 140, 20, 0, 0, 0, 0, 0, "");
        }
 }
 
@@ -2818,9 +2818,9 @@ static void material_panel_material(Object *ob, Material *ma)
        uiBlockSetCol(block, TH_BUT_SETTING2);
        std_libbuttons(block, 8, 200, 0, NULL, B_MATBROWSE, id, idfrom, &(G.buts->menunr), B_MATALONE, B_MATLOCAL, B_MATDELETE, B_AUTOMATNAME, B_KEEPDATA);
        
-       uiDefIconBut(block, BUT, B_MATCOPY, ICON_COPYUP,        263,200,XIC,YIC, 0, 0, 0, 0, 0, "Copies Material to the buffer");
+       uiDefIconBut(block, BUT, B_MATCOPY, ICON_COPYUP,        262,200,XIC,YIC, 0, 0, 0, 0, 0, "Copies Material to the buffer");
        uiSetButLock(id && id->lib, "Can't edit library data");
-       uiDefIconBut(block, BUT, B_MATPASTE, ICON_PASTEUP,      284,200,XIC,YIC, 0, 0, 0, 0, 0, "Pastes Material from the buffer");
+       uiDefIconBut(block, BUT, B_MATPASTE, ICON_PASTEUP,      283,200,XIC,YIC, 0, 0, 0, 0, 0, "Pastes Material from the buffer");
        
        if(ob->actcol==0) ob->actcol= 1;        /* because of TOG|BIT button */
        
@@ -2848,7 +2848,7 @@ static void material_panel_material(Object *ob, Material *ma)
        
        sprintf(str, "%d Mat", ob->totcol);
        if(ob->totcol) min= 1.0; else min= 0.0;
-       uiDefButC(block, NUM, B_ACTCOL, str,                    191,174,114,20, &(ob->actcol), min, (float)ob->totcol, 0, 0, "Shows the number of materials on object and the active material");
+       uiDefButC(block, NUM, B_ACTCOL, str,                    191,174,112,20, &(ob->actcol), min, (float)ob->totcol, 0, 0, "Shows the number of materials on object and the active material");
        uiBlockEndAlign(block);
        
        if(ob->totcol==0) return;
@@ -2860,7 +2860,7 @@ static void material_panel_material(Object *ob, Material *ma)
        if(ma->dynamode & MA_DRAW_DYNABUTS) {
                uiBlockBeginAlign(block);
                uiDefButF(block, NUMSLI, 0, "Restitut ",                128,120,175,20, &ma->reflect, 0.0, 1.0, 0, 0, "Elasticity of collisions");
-               uiDefButF(block, NUMSLI, 0, "Friction ",                128,98 ,175,20, &ma->friction, 0.0, 100.0, 0, 0,   "Coulomb friction coefficient");
+               uiDefButF(block, NUMSLI, 0, "Friction ",                128,82 ,175,20, &ma->friction, 0.0, 100.0, 0, 0,   "Coulomb friction coefficient");
                uiDefButF(block, NUMSLI, 0, "Fh Force ",                128,76 ,175,20, &ma->fh, 0.0, 1.0, 0, 0, "Upward spring force within the Fh area");
                uiBlockEndAlign(block);
                uiDefButF(block, NUM, 0,         "Fh Damp ",            8,120,100,20, &ma->xyfrict, 0.0, 1.0, 10, 0, "Damping of the Fh spring force");
@@ -2871,15 +2871,15 @@ static void material_panel_material(Object *ob, Material *ma)
                if(!(ma->mode & MA_HALO)) {
                        uiBlockBeginAlign(block);
                        uiBlockSetCol(block, TH_BUT_SETTING1);
-                       uiDefButI(block, TOG|BIT|4, B_REDR,     "VCol Light",   8,146,75,20, &(ma->mode), 0, 0, 0, 0, "Adds vertex colours as extra light");
-                       uiDefButI(block, TOG|BIT|7, B_REDR, "VCol Paint",       85,146,72,20, &(ma->mode), 0, 0, 0, 0, "Replaces material's colours with vertex colours");
-                       uiDefButI(block, TOG|BIT|11, B_REDR, "TexFace",         160,146,62,20, &(ma->mode), 0, 0, 0, 0, "Sets UV-Editor assigned texture as color and texture info for faces");
-                       uiDefButI(block, TOG|BIT|2, B_MATPRV, "Shadeless",      223,146,80,20, &(ma->mode), 0, 0, 0, 0, "Makes material insensitive to light or shadow");
+                       uiDefButI(block, TOG|BIT|4, B_REDR,     "VCol Light",   8,146,73,20, &(ma->mode), 0, 0, 0, 0, "Adds vertex colours as extra light");
+                       uiDefButI(block, TOG|BIT|7, B_REDR, "VCol Paint",       82,146,73,20, &(ma->mode), 0, 0, 0, 0, "Replaces material's colours with vertex colours");
+                       uiDefButI(block, TOG|BIT|11, B_REDR, "TexFace",         156,146,73,20, &(ma->mode), 0, 0, 0, 0, "Sets UV-Editor assigned texture as color and texture info for faces");
+                       uiDefButI(block, TOG|BIT|2, B_MATPRV, "Shadeless",      230,146,73,20, &(ma->mode), 0, 0, 0, 0, "Makes material insensitive to light or shadow");
                        uiBlockSetCol(block, TH_AUTO);
-                       uiDefButF(block, NUM, 0, "Zoffs:",                                      8,127,120,19, &(ma->zoffs), 0.0, 10.0, 0, 0, "Gives faces an artificial offset in the Z buffer");
+                       uiDefButF(block, NUM, 0, "Zoffs:",                                      8,127,147,19, &(ma->zoffs), 0.0, 10.0, 0, 0, "Gives faces an artificial offset in the Z buffer");
                        uiBlockSetCol(block, TH_BUT_SETTING1);
-                       uiDefButI(block, TOG|BIT|3, 0,  "Wire",                         128,127,96,19, &(ma->mode), 0, 0, 0, 0, "Renders only the edges of faces as a wireframe");
-                       uiDefButI(block, TOG|BIT|8, 0,  "ZInvert",                      224,127,79,19, &(ma->mode), 0, 0, 0, 0, "Renders material's faces with inverted Z Buffer");
+                       uiDefButI(block, TOG|BIT|3, 0,  "Wire",                         156,127,73,19, &(ma->mode), 0, 0, 0, 0, "Renders only the edges of faces as a wireframe");
+                       uiDefButI(block, TOG|BIT|8, 0,  "ZInvert",                      230,127,73,19, &(ma->mode), 0, 0, 0, 0, "Renders material's faces with inverted Z Buffer");
 
                }
                uiBlockSetCol(block, TH_AUTO);