diff options
author | Yevgeny Makarov <jenkm> | 2020-10-13 01:51:00 +0300 |
---|---|---|
committer | Harley Acheson <harley.acheson@gmail.com> | 2020-10-13 01:51:00 +0300 |
commit | dc71ad062408b138cc174f348d833b244d098a8f (patch) | |
tree | 9dbc597d98750ab5ef3ea80a0ee151c14040119c /source/blender | |
parent | 1d84881ac12f7d6ef7047733960880fa1f9ec0de (diff) |
UI: Monochrome Alert Icons and use the Question icon in the Quit dialog
Change to monochrome version of the large alert icons and use 'Question' for the the Quit Confirm dialog box.
Differential Revision: https://developer.blender.org/D9062
Reviewed by Pablo Vazquez
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/interface/interface.c | 17 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 |
2 files changed, 2 insertions, 17 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index e2e19e9fcd4..83e47ce9f07 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -4706,23 +4706,8 @@ uiBut *uiDefButImage( uiBut *uiDefButAlert(uiBlock *block, int icon, int x, int y, short width, short height) { struct ImBuf *ibuf = UI_icon_alert_imbuf_get(icon); - - if (icon == ALERT_ICON_BLENDER) { - return uiDefButImage(block, ibuf, x, y, width, height, NULL); - } - uchar icon_color[4]; - ThemeColorID color_id = TH_INFO_WARNING; - if (icon == ALERT_ICON_ERROR) { - color_id = TH_INFO_ERROR; - } - else if (icon == ALERT_ICON_INFO) { - color_id = TH_INFO_INFO; - } - else if (icon == ALERT_ICON_QUESTION) { - color_id = TH_INFO_PROPERTY; - } - UI_GetThemeColorType4ubv(color_id, SPACE_INFO, icon_color); + UI_GetThemeColor4ubv(TH_TEXT, icon_color); return uiDefButImage(block, ibuf, x, y, width, height, icon_color); } diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 23571395e24..ffafa1e5c0c 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -3172,7 +3172,7 @@ static uiBlock *block_create__close_file_dialog(struct bContext *C, /* Alert Icon. */ uiLayout *layout = uiLayoutColumn(split_block, false); - uiDefButAlert(block, ALERT_ICON_WARNING, 0, 0, 0, icon_size); + uiDefButAlert(block, ALERT_ICON_QUESTION, 0, 0, 0, icon_size); /* The rest of the content on the right. */ layout = uiLayoutColumn(split_block, false); |