Commit: ae50da6ea613444f22dc6f553c4860d13c893029
Author: Julian Eisel
Date: Mon Aug 3 16:17:02 2015 +0200
Branches: temp-ui-widget-refactor
https://developer.blender.org/rBae50da6ea613444f22dc6f553c4860d13c893029
Cleanup: Naming, get rid of a XXX
===================================================================
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/interface/widgets/widgets.h
M
source/blender/editors/interface/widgets/widgets_draw/drawstyle_classic.c
===================================================================
diff --git a/source/blender/editors/interface/interface_widgets.c
b/source/blender/editors/interface/interface_widgets.c
index 9c4efd0..b14fa26 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -478,7 +478,7 @@ static void ui_widget_color_disabled(uiWidgetType *wt)
}
/* copy colors from theme, and set changes in it based on state */
-static void widget_state(uiWidgetType *wt, int state)
+static void widget_state_regular(uiWidgetType *wt, int state)
{
uiWidgetStateColors *wcol_state = wt->wcol_state;
@@ -548,7 +548,7 @@ static void widget_state_option_menu(uiWidgetType *wt, int
state)
bTheme *btheme = UI_GetTheme(); /* XXX */
/* call this for option button */
- widget_state(wt, state);
+ widget_state_regular(wt, state);
/* if not selected we get theme from menu back */
if (state & UI_SELECT)
diff --git a/source/blender/editors/interface/widgets/widgets.h
b/source/blender/editors/interface/widgets/widgets.h
index b035426..0dc37b0 100644
--- a/source/blender/editors/interface/widgets/widgets.h
+++ b/source/blender/editors/interface/widgets/widgets.h
@@ -34,8 +34,6 @@
#include "DNA_userdef_types.h"
-#include "widgets_draw_intern.h" /* XXX */
-
struct uiBut;
struct uiWidgetType;
diff --git
a/source/blender/editors/interface/widgets/widgets_draw/drawstyle_classic.c
b/source/blender/editors/interface/widgets/widgets_draw/drawstyle_classic.c
index 46ad848..fb70af3 100644
--- a/source/blender/editors/interface/widgets/widgets_draw/drawstyle_classic.c
+++ b/source/blender/editors/interface/widgets/widgets_draw/drawstyle_classic.c
@@ -54,12 +54,12 @@
-static void widget_numbut_embossn(uiBut *but, uiWidgetColors *wcol, rcti
*rect, int state, int roundboxalign);
+static void widget_draw_numbut_embossn(uiBut *but, uiWidgetColors *wcol, rcti
*rect, int state, int roundboxalign);
/* widget drawing ************************************* */
-static void widget_box(uiBut *but, uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int roundboxalign)
+static void widget_custom_box(uiBut *but, uiWidgetColors *wcol, rcti *rect,
int UNUSED(state), int roundboxalign)
{
uiWidgetDrawBase wtb;
float rad;
@@ -85,7 +85,7 @@ static void widget_box(uiBut *but, uiWidgetColors *wcol, rcti
*rect, int UNUSED(
copy_v3_v3_char(wcol->inner, old_col);
}
-static void widget_but(uiWidgetColors *wcol, rcti *rect, int UNUSED(state),
int roundboxalign)
+static void widget_draw_but(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int roundboxalign)
{
uiWidgetDrawBase wtb;
float rad;
@@ -99,7 +99,7 @@ static void widget_but(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int
widget_drawbase_draw(&wtb, wcol);
}
-static void widget_checkbox(uiWidgetColors *wcol, rcti *rect, int state, int
UNUSED(roundboxalign))
+static void widget_draw_checkbox(uiWidgetColors *wcol, rcti *rect, int state,
int UNUSED(roundboxalign))
{
uiWidgetDrawBase wtb;
rcti recttemp = *rect;
@@ -134,7 +134,7 @@ static void widget_checkbox(uiWidgetColors *wcol, rcti
*rect, int state, int UNU
}
-static void widget_colorband(
+static void widget_custom_colorband(
uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *rect,
int UNUSED(state), int UNUSED(roundboxalign))
{
@@ -240,7 +240,7 @@ static void widget_colorband(
}
}
-static void widget_roundbut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int roundboxalign)
+static void widget_draw_roundbut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int roundboxalign)
{
uiWidgetDrawBase wtb;
const float rad = 0.25f * U.widget_unit;
@@ -284,7 +284,7 @@ static void widget_draw_extra_mask(uiBut *but,
uiWidgetColors *wcol, rcti *rect,
widget_drawbase_draw(&wtb, wcol);
}
-static void widget_hsv_circle(
+static void widget_custom_hsv_circle(
uiBut *but, uiWidgetColors *wcol, rcti *rect,
int UNUSED(state), int UNUSED(roundboxalign))
{
@@ -368,7 +368,7 @@ static void widget_hsv_circle(
ui_hsv_cursor(xpos, ypos);
}
-static void widget_hsv_cube(
+static void widget_custom_hsv_cube(
uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *rect,
int UNUSED(state), int UNUSED(roundboxalign))
{
@@ -402,7 +402,7 @@ static void widget_hsv_cube(
}
-static void widget_hsv_vert(
+static void widget_custom_hsv_vert(
uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *rect,
int UNUSED(state), int UNUSED(roundboxalign))
{
@@ -457,7 +457,7 @@ static void widget_hsv_vert(
ui_hsv_cursor(x, y);
}
-static void widget_icon_has_anim(uiBut *but, uiWidgetColors *wcol, rcti *rect,
int state, int roundboxalign)
+static void widget_custom_icon_has_anim(uiBut *but, uiWidgetColors *wcol, rcti
*rect, int state, int roundboxalign)
{
if (state & (UI_BUT_ANIMATED | UI_BUT_ANIMATED_KEY | UI_BUT_DRIVEN |
UI_BUT_REDALERT)) {
uiWidgetDrawBase wtb;
@@ -474,11 +474,11 @@ static void widget_icon_has_anim(uiBut *but,
uiWidgetColors *wcol, rcti *rect, i
else if (but->type == UI_BTYPE_NUM) {
/* Draw number buttons still with left/right
* triangles when field is not embossed */
- widget_numbut_embossn(but, wcol, rect, state, roundboxalign);
+ widget_draw_numbut_embossn(but, wcol, rect, state,
roundboxalign);
}
}
-static void widget_link(uiBut *but, uiWidgetColors *UNUSED(wcol), rcti *rect,
int UNUSED(state), int UNUSED(roundboxalign))
+static void widget_custom_link(uiBut *but, uiWidgetColors *UNUSED(wcol), rcti
*rect, int UNUSED(state), int UNUSED(roundboxalign))
{
if (but->flag & UI_SELECT) {
rcti rectlink;
@@ -494,7 +494,7 @@ static void widget_link(uiBut *but, uiWidgetColors
*UNUSED(wcol), rcti *rect, in
}
}
-static void widget_list_itembut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int UNUSED(roundboxalign))
+static void widget_draw_list_itembut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int UNUSED(roundboxalign))
{
uiWidgetDrawBase wtb;
float rad;
@@ -509,7 +509,7 @@ static void widget_list_itembut(uiWidgetColors *wcol, rcti
*rect, int UNUSED(sta
widget_drawbase_draw(&wtb, wcol);
}
-static void widget_listscroll(uiBut *but, uiWidgetColors *wcol, rcti *rect,
int state, int UNUSED(roundboxalign))
+static void widget_custom_listscroll(uiBut *but, uiWidgetColors *wcol, rcti
*rect, int state, int UNUSED(roundboxalign))
{
rcti rect1;
double value;
@@ -570,7 +570,7 @@ static void widget_listscroll(uiBut *but, uiWidgetColors
*wcol, rcti *rect, int
UI_draw_widget_scroll(wcol, rect, &rect1, state);
}
-static void widget_menu_back(uiWidgetColors *wcol, rcti *rect, int flag, int
direction)
+static void widget_draw_menu_back(uiWidgetColors *wcol, rcti *rect, int flag,
int direction)
{
uiWidgetDrawBase wtb;
int roundboxalign = UI_CNR_ALL;
@@ -601,7 +601,7 @@ static void widget_menu_back(uiWidgetColors *wcol, rcti
*rect, int flag, int dir
glDisable(GL_BLEND);
}
-static void widget_menuiconbut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int roundboxalign)
+static void widget_draw_menuiconbut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int roundboxalign)
{
uiWidgetDrawBase wtb;
float rad;
@@ -616,7 +616,7 @@ static void widget_menuiconbut(uiWidgetColors *wcol, rcti
*rect, int UNUSED(stat
widget_drawbase_draw(&wtb, wcol);
}
-static void widget_menu_itembut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int UNUSED(roundboxalign))
+static void widget_draw_menu_itembut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int UNUSED(roundboxalign))
{
uiWidgetDrawBase wtb;
@@ -629,7 +629,7 @@ static void widget_menu_itembut(uiWidgetColors *wcol, rcti
*rect, int UNUSED(sta
widget_drawbase_draw(&wtb, wcol);
}
-static void widget_menu_radial_itembut(uiBut *but, uiWidgetColors *wcol, rcti
*rect, int UNUSED(state), int UNUSED(roundboxalign))
+static void widget_custom_menu_radial_itembut(uiBut *but, uiWidgetColors
*wcol, rcti *rect, int UNUSED(state), int UNUSED(roundboxalign))
{
uiWidgetDrawBase wtb;
float rad;
@@ -652,7 +652,7 @@ static void widget_menu_radial_itembut(uiBut *but,
uiWidgetColors *wcol, rcti *r
widget_drawbase_draw(&wtb, wcol);
}
-static void widget_menunodebut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int roundboxalign)
+static void widget_draw_menunodebut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int roundboxalign)
{
/* silly node link button hacks */
uiWidgetDrawBase wtb;
@@ -677,7 +677,7 @@ static void widget_menunodebut(uiWidgetColors *wcol, rcti
*rect, int UNUSED(stat
*wcol = wcol_backup;
}
-static void widget_menubut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int roundboxalign)
+static void widget_draw_menubut(uiWidgetColors *wcol, rcti *rect, int
UNUSED(state), int roundboxalign)
{
uiWidgetDrawBase wtb;
float rad;
@@ -697,7 +697,7 @@ static void widget_menubut(uiWidgetColors *wcol, rcti
*rect, int UNUSED(state),
rect->xmax -= (6 * BLI_rcti_size_y(rect)) / 10;
}
-static void widget_textbut(uiWidgetColors *wcol, rcti *rect, int state, int
roundboxalign)
+static void widget_draw_textbut(uiWidgetColors *wcol, rcti *rect, int state,
int roundboxalign)
{
uiWidgetDrawBase wtb;
float rad;
@@ -714,7 +714,7 @@ static void widget_textbut(uiWidgetColors *wcol, rcti
*rect, int state, int roun
widget_drawbase_draw(&wtb, wcol);
}
-static void widget_numbut_draw(uiWidgetColors *wcol, rcti *rect, int state,
int roundboxalign, bool emboss)
+static void widget_draw_numbut_draw(uiWidgetColors *wcol, rcti *rect, int
state, int roundboxalign, bool emboss)
{
uiWidgetDrawBase wtb;
const float rad = 0.5f * BLI_rcti_size_y(rect);
@@ -744,7 +744,7 @@ static void widget_numbut_draw(uiWidgetColors *wcol, rcti
*rect, int state, int
}
}
-static void widget_progressbar(uiBut *but, uiWidgetColors *wcol, rcti *rect,
int UNUSED(state), int UNUSED(roundboxalign))
+static void widget_custom_progressbar(uiBut *but, uiWidgetColors *wcol, rcti
*rect, int UNUSED(state), int UNUSED(roundboxalign))
{
rcti rect_prog = *rect, rect_bar = *rect;
float value = but->a1;
@@ -770,7 +770,7 @@ static void widget_progressbar(uiBut *but, uiWidgetColors
*wcol, rcti *rect, int
rect->xmin -= 6 * UI_DPI_FAC;
}
-stati
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
