From 56598fd342aa888bf36f24034c5e369a7c2acd90 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sun, 16 Oct 2016 20:42:24 +0200 Subject: Some UI access to multi-frames icons... Not so happy to have to change whole UI API like that, but... can't really see another solution, since layout API does not return any handler to button(s) it creates. :/ --- source/blender/windowmanager/intern/wm_dragdrop.c | 2 +- source/blender/windowmanager/intern/wm_operators.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/windowmanager/intern') diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c index 3a53906a8e8..b06d942ae37 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.c +++ b/source/blender/windowmanager/intern/wm_dragdrop.c @@ -343,7 +343,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, 0, 1.0f / UI_DPI_FAC, 0.8); } /* item name */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index b9fd4d2e762..d416dc0b471 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1833,7 +1833,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar split = uiLayoutSplit(layout, 0.0f, false); col = uiLayoutColumn(split, false); - uiItemL(col, IFACE_("Links"), ICON_NONE); + uiItemL(col, IFACE_("Links"), ICON_NONE, 0); #if 0 uiItemStringO(col, IFACE_("Support an Open Animation Movie"), ICON_URL, "WM_OT_url_open", "url", "https://cloud.blender.org/join"); @@ -1858,7 +1858,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION); } uiItemStringO(col, IFACE_("Python API Reference"), ICON_URL, "WM_OT_url_open", "url", url); - uiItemL(col, "", ICON_NONE); + uiItemL(col, "", ICON_NONE, 0); col = uiLayoutColumn(split, false); @@ -1867,7 +1867,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar uiItemS(col); } - uiItemL(col, IFACE_("Recent"), ICON_NONE); + uiItemL(col, IFACE_("Recent"), ICON_NONE, 0); for (recent = G.recent_files.first, i = 0; (i < 5) && (recent); recent = recent->next, i++) { const char *filename = BLI_path_basename(recent->filepath); uiItemStringO(col, filename, @@ -1877,7 +1877,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar uiItemS(col); uiItemO(col, NULL, ICON_RECOVER_LAST, "WM_OT_recover_last_session"); - uiItemL(col, "", ICON_NONE); + uiItemL(col, "", ICON_NONE, 0); mt = WM_menutype_find("USERPREF_MT_splash_footer", false); if (mt) { -- cgit v1.2.3