Various icon adjustments
authorraa <roaoao@gmail.com>
Fri, 17 Mar 2017 13:47:19 +0000 (16:47 +0300)
committerraa <roaoao@gmail.com>
Fri, 17 Mar 2017 13:57:53 +0000 (16:57 +0300)
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/screen/area.c
source/blender/editors/space_outliner/outliner_draw.c

index 682db20af5532eb41ccd81c64be082fefb517004..0328d09ef9a2bb456ff3bcf33f8898207cdb780c 100644 (file)
@@ -3913,6 +3913,8 @@ uiBut *uiDefIconTextButO_ptr(uiBlock *block, int type, wmOperatorType *ot, int o
 uiBut *uiDefIconTextButO(uiBlock *block, int type, const char *opname, int opcontext, int icon, const char *str, int x, int y, short width, short height, const char *tip)
 {
        wmOperatorType *ot = WM_operatortype_find(opname, 0);
+       if (str[0] == '\0') 
+               return uiDefIconButO_ptr(block, type, ot, opcontext, icon, x, y, width, height, tip);
        return uiDefIconTextButO_ptr(block, type, ot, opcontext, icon, str, x, y, width, height, tip);
 }
 
index f6347388cc40a90b255d8ed3d2abe760c79db7bf..c62fb4cadd6e52d356079fe3e0162bad2eeb5cd5 100644 (file)
@@ -1274,7 +1274,7 @@ static void ui_item_rna_size(
        if (!w) {
                if (type == PROP_ENUM && icon_only) {
                        w = ui_text_icon_width(layout, "", ICON_BLANK1, 0);
-                       w += 0.5f * UI_UNIT_X;
+                       w += 0.6f * UI_UNIT_X;
                }
                else {
                        w = ui_text_icon_width(layout, name, icon, 0);
index 62f12cd7967d7e8e0fabbece580cb377a66b5aa6..131584dd405d3f59697e45bfdaf402dcf2cb3804 100644 (file)
@@ -430,7 +430,7 @@ static void template_ID(
                uiLayoutRow(layout, true);
        }
        else if (flag & UI_ID_BROWSE) {
-               but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X * 1.5, UI_UNIT_Y,
+               but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X * 1.6, UI_UNIT_Y,
                                     TIP_(template_id_browse_tip(type)));
                ui_def_but_icon(but, RNA_struct_ui_icon(type), UI_HAS_ICON);
                /* default dragging of icon for id browse buttons */
index 4a2c13e395fed60e15a924a296f33c636f192964..5ec0c49a8cdc133decdd2f188b0c8b56b9035714 100644 (file)
@@ -873,15 +873,18 @@ static void widget_draw_icon(
        if (icon && icon != ICON_BLANK1) {
                float ofs = 1.0f / aspect;
                
-               if (but->drawflag & UI_BUT_ICON_LEFT || ui_block_is_pie_menu(but->block)) {
+               if (but->drawflag & UI_BUT_ICON_LEFT) {
                        if (but->block->flag & UI_BLOCK_LOOP) {
                                if (but->type == UI_BTYPE_SEARCH_MENU)
                                        xs = rect->xmin + 4.0f * ofs;
                                else
-                                       xs = rect->xmin + 2.0f * ofs;
+                                       xs = rect->xmin + ofs;
                        }
                        else {
-                               xs = rect->xmin + 2.0f * ofs;
+                               if (but->dt == UI_EMBOSS_NONE || but->type == UI_BTYPE_LABEL)
+                                       xs = rect->xmin + 2.0f * ofs;
+                               else
+                                       xs = rect->xmin + 4.0f * ofs;
                        }
                        ys = (rect->ymin + rect->ymax - height) / 2.0f;
                }
index e6bb604d3876c8209356229f4bdcaaf352369f15..9cfaf3b4c1d315aee10b05c44a875c3106bb72f1 100644 (file)
@@ -1749,7 +1749,7 @@ int ED_area_header_switchbutton(const bContext *C, uiBlock *block, int yco)
 
        RNA_pointer_create(&(scr->id), &RNA_Area, sa, &areaptr);
 
-       uiDefButR(block, UI_BTYPE_MENU, 0, "", xco, yco, 1.5 * U.widget_unit, U.widget_unit,
+       uiDefButR(block, UI_BTYPE_MENU, 0, "", xco, yco, 1.6 * U.widget_unit, U.widget_unit,
                  &areaptr, "type", 0, 0.0f, 0.0f, 0.0f, 0.0f, "");
 
        return xco + 1.7 * U.widget_unit;
index 684a1f9fd670bbdd692deef88dd018c70f367087..42d9e4356ee7bb1cc6f8726ab1150ac0aceba473 100644 (file)
@@ -1040,9 +1040,6 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
        struct DrawIconArg arg;
        float aspect;
        
-       /* icons tiny bit away from text */
-       x -= 0.15f * UI_UNIT_Y;
-       
        /* make function calls a bit compacter */
        arg.block = block;
        arg.id = tselem->id;
@@ -1053,8 +1050,10 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
        
        /* placement of icons, copied from interface_widgets.c */
        aspect = (0.8f * UI_UNIT_Y) / ICON_DEFAULT_HEIGHT;
-       arg.x = x = x + 4.0f * aspect;
-       arg.y = y = y + 0.1f * UI_UNIT_Y;
+       x += 2.0f * aspect;
+       y += 2.0f * aspect;
+       arg.x = x = x;
+       arg.y = y = y;
 
        if (tselem->type) {
                switch (tselem->type) {
@@ -1389,9 +1388,9 @@ static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, Spa
                                UI_draw_roundbox_corner_set(UI_CNR_ALL);
                                glColor4ub(255, 255, 255, 100);
                                UI_draw_roundbox(
-                                       (float) *offsx - 1.0f * ufac,
+                                       (float) *offsx + 1.0f * ufac,
                                        (float)ys + 1.0f * ufac,
-                                       (float)*offsx + UI_UNIT_X - 2.0f * ufac,
+                                       (float)*offsx + UI_UNIT_X - 1.0f * ufac,
                                        (float)ys + UI_UNIT_Y - ufac,
                                        (float)UI_UNIT_Y / 2.0f - ufac);
                                glEnable(GL_BLEND); /* roundbox disables */
@@ -1536,9 +1535,9 @@ static void outliner_draw_tree_element(
                if (active != OL_DRAWSEL_NONE) {
                        UI_draw_roundbox_corner_set(UI_CNR_ALL);
                        UI_draw_roundbox(
-                               (float)startx + UI_UNIT_X,
+                               (float)startx + UI_UNIT_X + 1.0f * ufac,
                                (float)*starty + 1.0f * ufac,
-                               (float)startx + 2.0f * UI_UNIT_X - 2.0f * ufac,
+                               (float)startx + 2.0f * UI_UNIT_X - 1.0f * ufac,
                                (float)*starty + UI_UNIT_Y - 1.0f * ufac,
                                UI_UNIT_Y / 2.0f - 1.0f * ufac);
                        glEnable(GL_BLEND); /* roundbox disables it */
@@ -1549,16 +1548,13 @@ static void outliner_draw_tree_element(
                /* open/close icon, only when sublevels, except for scene */
                if (te->subtree.first || (tselem->type == 0 && te->idcode == ID_SCE) || (te->flag & TE_LAZY_CLOSED)) {
                        int icon_x;
-                       if (tselem->type == 0 && ELEM(te->idcode, ID_OB, ID_SCE))
-                               icon_x = startx;
-                       else
-                               icon_x = startx + 5 * ufac;
+                       icon_x = startx;
                        
                        // icons a bit higher
                        if (TSELEM_OPEN(tselem, soops))
-                               UI_icon_draw((float)icon_x, (float)*starty + 2 * ufac, ICON_DISCLOSURE_TRI_DOWN);
+                               UI_icon_draw((float)icon_x + 2 * ufac, (float)*starty + 1 * ufac, ICON_DISCLOSURE_TRI_DOWN);
                        else
-                               UI_icon_draw((float)icon_x, (float)*starty + 2 * ufac, ICON_DISCLOSURE_TRI_RIGHT);
+                               UI_icon_draw((float)icon_x + 2 * ufac, (float)*starty + 1 * ufac, ICON_DISCLOSURE_TRI_RIGHT);
                }
                offsx += UI_UNIT_X;
                
@@ -1568,7 +1564,7 @@ static void outliner_draw_tree_element(
                        
                        tselem_draw_icon(block, xmax, (float)startx + offsx, (float)*starty, tselem, te, 1.0f);
                        
-                       offsx += UI_UNIT_X;
+                       offsx += UI_UNIT_X + 2 * ufac;
                }
                else
                        offsx += 2 * ufac;
@@ -1576,16 +1572,16 @@ static void outliner_draw_tree_element(
                if (tselem->type == 0 && ID_IS_LINKED_DATABLOCK(tselem->id)) {
                        glPixelTransferf(GL_ALPHA_SCALE, 0.5f);
                        if (tselem->id->tag & LIB_TAG_MISSING) {
-                               UI_icon_draw((float)startx + offsx, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_BROKEN);
+                               UI_icon_draw((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_BROKEN);
                        }
                        else if (tselem->id->tag & LIB_TAG_INDIRECT) {
-                               UI_icon_draw((float)startx + offsx, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_INDIRECT);
+                               UI_icon_draw((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_INDIRECT);
                        }
                        else {
-                               UI_icon_draw((float)startx + offsx, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_DIRECT);
+                               UI_icon_draw((float)startx + offsx + 2 * ufac, (float)*starty + 2 * ufac, ICON_LIBRARY_DATA_DIRECT);
                        }
                        glPixelTransferf(GL_ALPHA_SCALE, 1.0f);
-                       offsx += UI_UNIT_X;
+                       offsx += UI_UNIT_X + 2 * ufac;
                }
                glDisable(GL_BLEND);
                
@@ -1757,7 +1753,7 @@ static void outliner_draw_tree(bContext *C, uiBlock *block, Scene *scene, ARegio
        // gray hierarchy lines
        UI_ThemeColorBlend(TH_BACK, TH_TEXT, 0.4f);
        starty = (int)ar->v2d.tot.ymax - UI_UNIT_Y / 2 - OL_Y_OFFSET;
-       startx = 6;
+       startx = UI_UNIT_X / 2 - 1.0f;
        outliner_draw_hierarchy(soops, &soops->tree, startx, &starty);
        
        // items themselves