diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 19:25:50 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 19:39:50 +0300 |
| commit | 28324143c4ce657c4de773c8363b93b27625243e (patch) | |
| tree | 3b1ca0b83f38038a6c4e9ea12fe054d776b36c41 /source/blender/windowmanager/intern/wm_dragdrop.c | |
| parent | 99fa874c858dbbe10be70d3be03ad337780c1ec0 (diff) | |
UI: draw mono icons with button type text color, instead of area text color.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_dragdrop.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_dragdrop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 73748ba6322..1c86f0ab9b7 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -396,6 +396,7 @@ void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect) /* XXX todo, multiline drag draws... but maybe not, more types mixed wont work well */ glEnable(GL_BLEND); for (drag = wm->drags.first; drag; drag = drag->next) { + const char text_col[] = {255, 255, 255, 255}; int iconsize = UI_DPI_ICON_SIZE; int padding = 4 * UI_DPI_FAC; @@ -420,7 +421,7 @@ void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect) if (rect) drag_rect_minmax(rect, x, y, x + iconsize, y + iconsize); else - UI_icon_draw_aspect(x, y, drag->icon, 1.0f / UI_DPI_FAC, 0.8); + UI_icon_draw_aspect(x, y, drag->icon, 1.0f / UI_DPI_FAC, 0.8, text_col); } /* item name */ @@ -438,8 +439,7 @@ void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect) drag_rect_minmax(rect, x, y, x + w, y + iconsize); } else { - const unsigned char col[] = {255, 255, 255, 255}; - UI_fontstyle_draw_simple(fstyle, x, y, wm_drag_name(drag), col); + UI_fontstyle_draw_simple(fstyle, x, y, wm_drag_name(drag), (unsigned char*)text_col); } /* operator name with roundbox */ |