diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-01-30 16:14:27 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-01-30 16:20:31 +0300 |
| commit | 3da834e83ce9d7056c033148dab04885a6d3b1b7 (patch) | |
| tree | d6e192f2b247c70e57a88ee985dfc773284d6af8 /source/blender/editors/interface/interface_widgets.c | |
| parent | dce8ef49ffb7c2e38455da8195b9cacba8b0424a (diff) | |
Collection Editor based on patch by Julian Eisel
This is extracted from the layer-manager branch. With the following
changes:
* Renamed references of layer manager to collections manager
* I didn't include the editors/space_collections/ draw and util files.
I still need to bring the drawing code here, so we see something.
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index b75ecf68136..9dd6c670da8 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1575,7 +1575,10 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB } } - if (but->editstr || (but->drawflag & UI_BUT_TEXT_LEFT)) { + if (but->drawflag & UI_BUT_TEXT_NO_MARGIN) { + /* skip */ + } + else if (but->editstr || (but->drawflag & UI_BUT_TEXT_LEFT)) { rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) / but->block->aspect; } else if ((but->drawflag & UI_BUT_TEXT_RIGHT)) { |