diff options
| author | Matt Ebb <matt@mke3.net> | 2009-05-20 17:56:22 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-05-20 17:56:22 +0400 |
| commit | 2e91f1b1555b54784eda5d133d8a3b594d0b8797 (patch) | |
| tree | ab48c8791ff115246d1baf5c06bf30b9c268011d /source/blender/editors | |
| parent | a47c673b5525fde6484d4392160fbb5101f2c108 (diff) | |
Assorted UI tweaks/cleanups
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_style.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index e937ab0c50a..2bcc1a03923 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1986,7 +1986,7 @@ void uiBlockEndAlign(uiBlock *block) int ui_but_can_align(uiBut *but) { - return !ELEM(but->type, LABEL, ROUNDBOX); + return !ELEM3(but->type, LABEL, ROUNDBOX, TOG); } static void ui_block_do_align_but(uiBlock *block, uiBut *first, int nr) diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index f789f81e0d3..34f4d7294ee 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -90,7 +90,7 @@ static uiStyle *ui_style_new(ListBase *styles, const char *name) BLI_strncpy(style->name, name, MAX_STYLE_NAME); style->paneltitle.uifont_id= UIFONT_DEFAULT; - style->paneltitle.points= 14; + style->paneltitle.points= 13; style->paneltitle.shadow= 5; style->paneltitle.shadx= 2; style->paneltitle.shady= -2; diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 7bc63c5c676..18b39518ee6 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1378,6 +1378,7 @@ static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int s double value; float offs, fac; char outline[3]; + int slideralign; widget_init(&wtb); widget_init(&wtb1); @@ -1395,10 +1396,12 @@ static void widget_numslider(uiBut *but, uiWidgetColors *wcol, rcti *rect, int s rect1= *rect; value= ui_get_but_val(but); - fac= (value-but->softmin)*(rect1.xmax - rect1.xmin - 2.0f*offs)/(but->softmax - but->softmin); + fac= (value-but->softmin)*(rect1.xmax - rect1.xmin - offs)/(but->softmax - but->softmin); - rect1.xmax= rect1.xmin + fac + 2.0f*offs; - round_box_edges(&wtb1, roundboxalign, &rect1, offs); + rect1.xmax= rect1.xmin + fac + offs; + slideralign = roundboxalign; + slideralign &= ~(2|4); + round_box_edges(&wtb1, slideralign, &rect1, offs); VECCOPY(outline, wcol->outline); VECCOPY(wcol->outline, wcol->item); |