blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Fix #117780: Allow Embossing With Horizontal Layouts #118304

Merged
Harley Acheson merged 2 commits from Harley/blender:Fix117780 into blender-v4.1-release 2024-02-19 22:26:16 +01:00
Conversation 4 Commits 2 Files Changed 1 +46 -17
1 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
source/blender/editors/interface/interface_widgets.cc
View File

@ -2637,6 +2637,32 @@ static float widget_radius_from_rcti(const rcti *rect, const uiWidgetColors *wco
/** \} */
/* -------------------------------------------------------------------- */
/** \name Widget Emboss Helper
*
* Emboss is an (optional) shadow shown under the bottom edge of buttons. For
* vertically-aligned stacks of buttons it should only be shown under the bottom one.
* \{ */
static bool draw_emboss(const uiBut *but)
{
if (but->drawflag & UI_BUT_ALIGN_DOWN) {
return false;
}
if (but->type == UI_BTYPE_TAB &&
(BLI_rctf_size_y(&but->block->rect) > BLI_rctf_size_x(&but->block->rect)) &&
!(but->next == nullptr || but->next->type == UI_BTYPE_SEPR))
{
/* Vertical tabs, emboss at end and before separators. */
return false;
}
return true;
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name Widget Types
* \{ */
@ -3394,7 +3420,8 @@ static void ui_draw_separator(const rcti *rect, const uiWidgetColors *wcol)
#define NUM_BUT_PADDING_FACTOR 0.425f
static void widget_numbut_draw(uiWidgetColors *wcol,
static void widget_numbut_draw(const uiBut *but,
uiWidgetColors *wcol,
rcti *rect,
const float zoom,
const uiWidgetStateInfo *state,
@ -3484,12 +3511,12 @@ static void widget_numbut_draw(uiWidgetColors *wcol,
/* outline */
wtb.draw_inner = false;
wtb.draw_emboss = roundboxalign & (UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT);
wtb.draw_emboss = draw_emboss(but);
widgetbase_draw(&wtb, wcol);
}
else {
/* inner and outline */
wtb.draw_emboss = roundboxalign & (UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT);
wtb.draw_emboss = draw_emboss(but);
widgetbase_draw(&wtb, wcol);
}
@ -3501,13 +3528,14 @@ static void widget_numbut_draw(uiWidgetColors *wcol,
}
}
static void widget_numbut(uiWidgetColors *wcol,
static void widget_numbut(uiBut *but,
uiWidgetColors *wcol,
rcti *rect,
const uiWidgetStateInfo *state,
int roundboxalign,
const float zoom)
{
widget_numbut_draw(wcol, rect, zoom, state, roundboxalign, false);
widget_numbut_draw(but, wcol, rect, zoom, state, roundboxalign, false);
}
static void widget_menubut(uiWidgetColors *wcol,
@ -3558,14 +3586,14 @@ static void widget_menubut_embossn(const uiBut * /*but*/,
/**
* Draw number buttons still with triangles when field is not embossed
*/
static void widget_numbut_embossn(const uiBut * /*but*/,
static void widget_numbut_embossn(const uiBut *but,
uiWidgetColors *wcol,
rcti *rect,
const uiWidgetStateInfo *state,
int roundboxalign,
const float zoom)
{
widget_numbut_draw(wcol, rect, zoom, state, roundboxalign, true);
widget_numbut_draw(but, wcol, rect, zoom, state, roundboxalign, true);
}
void UI_draw_widget_scroll(uiWidgetColors *wcol, const rcti *rect, const rcti *slider, int state)
@ -4405,8 +4433,7 @@ static void widget_box(uiBut *but,
const float rad = widget_radius_from_zoom(zoom, wcol);
round_box_edges(&wtb, roundboxalign, rect, rad);
wtb.draw_emboss = roundboxalign & (UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT);
wtb.draw_emboss = draw_emboss(but);
widgetbase_draw(&wtb, wcol);
copy_v3_v3_uchar(wcol->inner, old_col);
@ -4442,7 +4469,8 @@ static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int /*state*/ int
}
#endif
static void widget_roundbut_exec(uiWidgetColors *wcol,
static void widget_roundbut_exec(uiBut *but,
uiWidgetColors *wcol,
rcti *rect,
const uiWidgetStateInfo *state,
int roundboxalign,
@ -4460,12 +4488,12 @@ static void widget_roundbut_exec(uiWidgetColors *wcol,
/* half rounded */
round_box_edges(&wtb, roundboxalign, rect, rad);
wtb.draw_emboss = roundboxalign & (UI_CNR_BOTTOM_LEFT | UI_CNR_BOTTOM_RIGHT);
wtb.draw_emboss = draw_emboss(but);
widgetbase_draw(&wtb, wcol);
}
static void widget_tab(uiWidgetColors *wcol,
static void widget_tab(uiBut *but,
uiWidgetColors *wcol,
rcti *rect,
const uiWidgetStateInfo *state,
int roundboxalign,
@ -4500,6 +4528,7 @@ static void widget_tab(uiWidgetColors *wcol,
#ifdef USE_TAB_SHADED_HIGHLIGHT
wtb.draw_outline = 0;
#endif
wtb.draw_emboss = draw_emboss(but);
widgetbase_draw(&wtb, wcol);
/* We are drawing on top of widget bases. Flush cache. */
@ -4594,7 +4623,7 @@ static uiWidgetType *widget_type(uiWidgetTypeEnum type)
case UI_WTYPE_NUMBER:
wt.wcol_theme = &btheme->tui.wcol_num;
wt.draw = widget_numbut;
wt.custom = widget_numbut;
break;
case UI_WTYPE_SLIDER:
@ -4605,17 +4634,17 @@ static uiWidgetType *widget_type(uiWidgetTypeEnum type)
case UI_WTYPE_EXEC:
wt.wcol_theme = &btheme->tui.wcol_tool;
wt.draw = widget_roundbut_exec;
wt.custom = widget_roundbut_exec;
break;
case UI_WTYPE_TOOLBAR_ITEM:
wt.wcol_theme = &btheme->tui.wcol_toolbar_item;
wt.draw = widget_roundbut_exec;
wt.custom = widget_roundbut_exec;
break;
case UI_WTYPE_TAB:
wt.wcol_theme = &btheme->tui.wcol_tab;
wt.draw = widget_tab;
wt.custom = widget_tab;
break;
case UI_WTYPE_TOOLTIP: