[Bf-blender-cvs] [c8131cb] wiggly-widgets: Cleanup: Avoid special widget flag API functions, use general function instead
Julian Eisel
noreply at git.blender.org
Tue Sep 15 00:14:05 CEST 2015
Commit: c8131cb0f6b4cb5daf6f0cee88c906976dc21b60
Author: Julian Eisel
Date: Tue Sep 15 00:10:47 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBc8131cb0f6b4cb5daf6f0cee88c906976dc21b60
Cleanup: Avoid special widget flag API functions, use general function instead
===================================================================
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_widgets.c
M source/blender/windowmanager/wm.h
===================================================================
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index 52c64c6..364651f 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -755,8 +755,8 @@ static void WIDGETGROUP_camera_create(const struct bContext *C, struct wmWidgetG
const char *propname = "dof_distance";
widget = WIDGET_arrow_new(wgroup, propname, WIDGET_ARROW_STYLE_CROSS);
- WM_widget_set_draw_on_hover_only(widget, true);
- WM_widget_set_3d_scale(widget, false);
+ WM_widget_set_flag(widget, WM_WIDGET_DRAW_HOVER, true);
+ WM_widget_set_flag(widget, WM_WIDGET_SCALE_3D, false);
WM_widget_set_colors(widget, color_camera, color_hi_camera);
WM_widget_set_origin(widget, ob->obmat[3]);
@@ -806,7 +806,7 @@ static void WIDGETGROUP_camera_create(const struct bContext *C, struct wmWidgetG
WM_widget_set_origin(widget, ob->obmat[3]);
WM_widget_set_offset(widget, offset);
WM_widget_set_scale(widget, drawsize);
- WM_widget_set_3d_scale(widget, false);
+ WM_widget_set_flag(widget, WM_WIDGET_SCALE_3D, false);
WM_widget_set_colors(widget, color_camera, color_hi_camera);
WIDGET_arrow_set_direction(widget, dir);
@@ -844,7 +844,7 @@ static void WIDGETGROUP_forcefield_create(const struct bContext *C, struct wmWid
WM_widget_set_colors(widget, col, col_hi);
WM_widget_set_origin(widget, ob->obmat[3]);
WM_widget_set_offset(widget, ofs);
- WM_widget_set_3d_scale(widget, false);
+ WM_widget_set_flag(widget, WM_WIDGET_SCALE_3D, false);
WM_widget_property(widget, ARROW_SLOT_OFFSET_WORLD_SPACE, &ptr, "strength");
}
}
@@ -950,7 +950,7 @@ static void WIDGETGROUP_armature_facemap_create(const struct bContext *C, struct
RNA_property_boolean_set(opptr, prop, true);
}
WM_widget_set_colors(widget, color_shape, color_shape);
- WM_widget_set_draw_on_hover_only(widget, true);
+ WM_widget_set_flag(widget, WM_WIDGET_DRAW_HOVER, true);
}
}
}
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index dc45992..86f7c34 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1089,7 +1089,7 @@ void WIDGETGROUP_manipulator_create(const struct bContext *C, struct wmWidgetGro
if (fabsf(mat4_to_scale(rv3d->twmat)) < 1e-7f) {
MAN_ITER_AXES_BEGIN
{
- WM_widget_flag_set(axis, WM_WIDGET_HIDDEN, true);
+ WM_widget_set_flag(axis, WM_WIDGET_HIDDEN, true);
}
MAN_ITER_AXES_END;
@@ -1109,7 +1109,7 @@ void WIDGETGROUP_manipulator_create(const struct bContext *C, struct wmWidgetGro
float col[4], col_hi[4];
if (manipulator_is_axis_visible(v3d, rv3d, axis_idx) == false) {
- WM_widget_flag_set(axis, WM_WIDGET_HIDDEN, true);
+ WM_widget_set_flag(axis, WM_WIDGET_HIDDEN, true);
continue;
}
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 647db0e..250484e 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -514,12 +514,21 @@ void WM_modal_handler_attach_widgetgroup(struct bContext *C, struct wmEventHandl
void WM_widgetgroup_customdata_set(struct wmWidgetGroup *wgroup, void *data);
void *WM_widgetgroup_customdata(const struct wmWidgetGroup *wgroup);
+/* wmWidget->flag */
+enum widgetflags {
+ /* states */
+ WM_WIDGET_HIGHLIGHT = (1 << 0),
+ WM_WIDGET_ACTIVE = (1 << 1),
+ /* settings */
+ WM_WIDGET_DRAW_HOVER = (1 << 2),
+ WM_WIDGET_SCALE_3D = (1 << 3),
+ WM_WIDGET_SCENE_DEPTH = (1 << 4), /* widget is depth culled with scene objects*/
+ WM_WIDGET_HIDDEN = (1 << 5),
+};
+
void WM_widget_set_origin(struct wmWidget *widget, const float origin[3]);
void WM_widget_set_offset(struct wmWidget *widget, const float offset[3]);
-void WM_widget_set_3d_scale(struct wmWidget *widget, const bool scale);
-void WM_widget_flag_set(struct wmWidget *widget, const int flag, const bool enable);
-void WM_widget_set_draw_on_hover_only(struct wmWidget *widget, const bool draw);
-void WM_widget_set_scene_depth(struct wmWidget *widget, const bool scene);
+void WM_widget_set_flag(struct wmWidget *widget, const int flag, const bool enable);
void WM_widget_set_scale(struct wmWidget *widget, float scale);
void WM_widget_set_line_width(struct wmWidget *widget, const float line_width);
void WM_widget_set_colors(struct wmWidget *widget, const float col[4], const float col_hi[4]);
diff --git a/source/blender/windowmanager/intern/wm_widgets.c b/source/blender/windowmanager/intern/wm_widgets.c
index 45eb619..e8c89ab 100644
--- a/source/blender/windowmanager/intern/wm_widgets.c
+++ b/source/blender/windowmanager/intern/wm_widgets.c
@@ -470,17 +470,7 @@ void WM_widget_set_offset(wmWidget *widget, const float offset[3])
copy_v3_v3(widget->offset, offset);
}
-void WM_widget_set_3d_scale(wmWidget *widget, const bool scale)
-{
- if (scale) {
- widget->flag |= WM_WIDGET_SCALE_3D;
- }
- else {
- widget->flag &= ~WM_WIDGET_SCALE_3D;
- }
-}
-
-void WM_widget_flag_set(wmWidget *widget, const int flag, const bool enable)
+void WM_widget_set_flag(wmWidget *widget, const int flag, const bool enable)
{
if (enable) {
widget->flag |= flag;
@@ -490,27 +480,6 @@ void WM_widget_flag_set(wmWidget *widget, const int flag, const bool enable)
}
}
-void WM_widget_set_draw_on_hover_only(wmWidget *widget, const bool draw)
-{
- if (draw) {
- widget->flag |= WM_WIDGET_DRAW_HOVER;
- }
- else {
- widget->flag &= ~WM_WIDGET_DRAW_HOVER;
- }
-}
-
-void WM_widget_set_scene_depth(wmWidget *widget, const bool scene)
-{
- if (scene) {
- widget->flag |= WM_WIDGET_SCENE_DEPTH;
- }
- else {
- widget->flag &= ~WM_WIDGET_SCENE_DEPTH;
- }
-}
-
-
void WM_widget_set_scale(wmWidget *widget, const float scale)
{
widget->user_scale = scale;
@@ -525,7 +494,7 @@ void WM_widget_set_line_width(wmWidget *widget, const float line_width)
* Set widget rgba colors
*
* \param col Normal state color
- * \param col_hi Highlighted state color
+ * \param col_hi Highlighted state color
*/
void WM_widget_set_colors(wmWidget *widget, const float col[4], const float col_hi[4])
{
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index e4c3e4d..56dec19 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -119,16 +119,6 @@ typedef struct wmWidget {
struct PropertyRNA **props;
} wmWidget;
-/* wmWidget->flag */
-enum widgetflags {
- /* states */
- WM_WIDGET_HIGHLIGHT = (1 << 0),
- WM_WIDGET_ACTIVE = (1 << 1),
- WM_WIDGET_DRAW_HOVER = (1 << 2),
- WM_WIDGET_SCALE_3D = (1 << 3),
- WM_WIDGET_SCENE_DEPTH = (1 << 4), /* widget is depth culled with scene objects*/
- WM_WIDGET_HIDDEN = (1 << 5),
-};
extern void wm_close_and_free(bContext *C, wmWindowManager *);
extern void wm_close_and_free_all(bContext *C, ListBase *);
More information about the Bf-blender-cvs
mailing list