From ad409e5c7e3a235ed93f6927d960583521bc8f7d Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Tue, 10 Nov 2009 03:48:02 +0000 Subject: * Small UI drawing tweaks, part of it allowing a bit of extra space for text in number fields --- source/blender/editors/interface/interface_icons.c | 2 +- source/blender/editors/interface/interface_widgets.c | 11 ++--------- source/blender/editors/space_buttons/buttons_context.c | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index ad96796213d..90f15d7992e 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -705,7 +705,7 @@ int UI_icon_get_width(int icon_id) } if (di) - return ICON_DEFAULT_HEIGHT; + return ICON_DEFAULT_WIDTH; return 0; } diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 65f1f9a2f70..00b72786e68 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1681,15 +1681,8 @@ static void widget_numbut(uiWidgetColors *wcol, rcti *rect, int state, int round widgetbase_draw(&wtb, wcol); /* text space */ - if(!(state & UI_TEXTINPUT)) { - rect->xmin += (rect->ymax-rect->ymin); - rect->xmax -= (rect->ymax-rect->ymin); - } - else { - textoffs= rad; - rect->xmin += textoffs; - rect->xmax -= textoffs; - } + rect->xmin += rad*0.75f; + rect->xmax -= rad*0.75f; } diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 47055851e03..71d5b59f253 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -764,7 +764,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout) ptr= &path->ptr[a]; if(a != 0) - uiDefIconBut(block, LABEL, 0, VICON_SMALL_TRI_RIGHT, 0, 0, 10, UI_UNIT_Y, NULL, 0, 0, 0, 0, ""); + uiItemL(row, "", VICON_SMALL_TRI_RIGHT); if(ptr->data) { icon= RNA_struct_ui_icon(ptr->type); -- cgit v1.2.3