bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: rename uiButProgressbar to uiButProgress

Browse Source 
Prepare for other types of progress to be added.
This commit is contained in:
Campbell Barton 2023-07-12 13:15:39 +10:00
parent 46815ac188
commit e63a77eeb8
7 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/UI_interface.h
View File

@ -404,7 +404,7 @@ typedef enum {
UI_BTYPE_HISTOGRAM = 48 << 9,
UI_BTYPE_WAVEFORM = 49 << 9,
UI_BTYPE_VECTORSCOPE = 50 << 9,
UI_BTYPE_PROGRESS_BAR = 51 << 9,
UI_BTYPE_PROGRESS = 51 << 9,
UI_BTYPE_NODE_SOCKET = 53 << 9,
UI_BTYPE_SEPR = 54 << 9,
UI_BTYPE_SEPR_LINE = 55 << 9,

12
source/blender/editors/interface/interface.cc
View File

@ -899,10 +899,10 @@ static void ui_but_update_old_active_from_new(uiBut *oldbut, uiBut *but)
}
switch (oldbut->type) {
case UI_BTYPE_PROGRESS_BAR: {
uiButProgressbar *progress_oldbut = (uiButProgressbar *)oldbut;
uiButProgressbar *progress_but = (uiButProgressbar *)but;
progress_oldbut->progress = progress_but->progress;
case UI_BTYPE_PROGRESS: {
uiButProgress *progress_oldbut = (uiButProgress *)oldbut;
uiButProgress *progress_but = (uiButProgress *)but;
progress_oldbut->progress_factor = progress_but->progress_factor;
break;
}
case UI_BTYPE_VIEW_ITEM: {
@ -4018,8 +4018,8 @@ static uiBut *ui_but_new(const eButType type)
case UI_BTYPE_SEARCH_MENU:
but = MEM_new<uiButSearch>("uiButSearch");
break;
case UI_BTYPE_PROGRESS_BAR:
but = MEM_new<uiButProgressbar>("uiButProgressbar");
case UI_BTYPE_PROGRESS:
but = MEM_new<uiButProgress>("uiButProgress");
break;
case UI_BTYPE_HSVCUBE:
but = MEM_new<uiButHSVCube>("uiButHSVCube");

2
source/blender/editors/interface/interface_handlers.cc
View File

@ -8107,7 +8107,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
case UI_BTYPE_ROUNDBOX:
case UI_BTYPE_LABEL:
case UI_BTYPE_IMAGE:
case UI_BTYPE_PROGRESS_BAR:
case UI_BTYPE_PROGRESS:
case UI_BTYPE_NODE_SOCKET:
case UI_BTYPE_PREVIEW_TILE:
retval = ui_do_but_EXIT(C, but, data, event);

8
source/blender/editors/interface/interface_intern.hh
View File

@ -341,10 +341,10 @@ struct uiButDecorator : public uiBut {
int decorated_rnaindex = -1;
};
/** Derived struct for #UI_BTYPE_PROGRESS_BAR. */
struct uiButProgressbar : public uiBut {
/* 0..1 range */
float progress = 0;
/** Derived struct for #UI_BTYPE_PROGRESS. */
struct uiButProgress : public uiBut {
/** Progress in 0..1 range */
float progress_factor = 0.0f;
};
struct uiButViewItem : public uiBut {

2
source/blender/editors/interface/interface_query.cc
View File

@ -38,7 +38,7 @@ bool ui_but_is_editable(const uiBut *but)
UI_BTYPE_SEPR_LINE,
UI_BTYPE_ROUNDBOX,
UI_BTYPE_LISTBOX,
UI_BTYPE_PROGRESS_BAR);
UI_BTYPE_PROGRESS);
}
bool ui_but_is_editable_as_text(const uiBut *but)

32
source/blender/editors/interface/interface_templates.cc
View File

@ -6302,23 +6302,23 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
MEM_mallocN(sizeof(*tip_arg), __func__));
tip_arg->wm = wm;
tip_arg->owner = owner;
uiButProgressbar *but_progress = (uiButProgressbar *)uiDefIconTextBut(block,
UI_BTYPE_PROGRESS_BAR,
0,
0,
text,
UI_UNIT_X,
0,
UI_UNIT_X * 6.0f,
UI_UNIT_Y,
nullptr,
0.0f,
0.0f,
0.0f,
0,
nullptr);
uiButProgress *but_progress = (uiButProgress *)uiDefIconTextBut(block,
UI_BTYPE_PROGRESS,
0,
0,
text,
UI_UNIT_X,
0,
UI_UNIT_X * 6.0f,
UI_UNIT_Y,
nullptr,
0.0f,
0.0f,
0.0f,
0,
nullptr);
but_progress->progress = progress;
but_progress->progress_factor = progress;
UI_but_func_tooltip_set(but_progress, progress_tooltip_func, tip_arg, MEM_freeN);
}

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

@ -103,7 +103,7 @@ enum uiWidgetTypeEnum {
UI_WTYPE_BOX,
UI_WTYPE_SCROLL,
UI_WTYPE_LISTITEM,
UI_WTYPE_PROGRESSBAR,
UI_WTYPE_PROGRESS,
UI_WTYPE_NODESOCKET,
UI_WTYPE_VIEW_ITEM,
};
@ -3604,14 +3604,14 @@ static void widget_scroll(uiBut *but,
UI_draw_widget_scroll(wcol, rect, &rect1, (state->but_flag & UI_SELECT) ? UI_SCROLL_PRESSED : 0);
}
static void widget_progressbar(uiBut *but,
uiWidgetColors *wcol,
rcti *rect,
const uiWidgetStateInfo * /*state*/,
int roundboxalign,
const float zoom)
static void widget_progress_indicator(uiBut *but,
uiWidgetColors *wcol,
rcti *rect,
const uiWidgetStateInfo * /*state*/,
int roundboxalign,
const float zoom)
{
uiButProgressbar *but_progressbar = (uiButProgressbar *)but;
uiButProgress *but_progress = (uiButProgress *)but;
rcti rect_prog = *rect, rect_bar = *rect;
uiWidgetBase wtb, wtb_bar;
@ -3619,7 +3619,7 @@ static void widget_progressbar(uiBut *but,
widget_init(&wtb_bar);
/* round corners */
const float value = but_progressbar->progress;
const float value = but_progress->progress_factor;
const float ofs = widget_radius_from_zoom(zoom, wcol);
float w = value * BLI_rcti_size_x(&rect_prog);
@ -4556,9 +4556,9 @@ static uiWidgetType *widget_type(uiWidgetTypeEnum type)
wt.draw = widget_list_itembut;
break;
case UI_WTYPE_PROGRESSBAR:
case UI_WTYPE_PROGRESS:
wt.wcol_theme = &btheme->tui.wcol_progress;
wt.custom = widget_progressbar;
wt.custom = widget_progress_indicator;
break;
case UI_WTYPE_VIEW_ITEM:
@ -4896,8 +4896,8 @@ void ui_draw_but(const bContext *C, ARegion *region, uiStyle *style, uiBut *but,
ui_draw_but_CURVEPROFILE(region, but, &tui->wcol_regular, rect);
break;
case UI_BTYPE_PROGRESS_BAR:
wt = widget_type(UI_WTYPE_PROGRESSBAR);
case UI_BTYPE_PROGRESS:
wt = widget_type(UI_WTYPE_PROGRESS);
fstyle = &style->widgetlabel;
break;