blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: minor changes and comments to screen_bounds_get access

This commit is contained in:
Campbell Barton 2021-01-25 13:49:32 +11:00
parent 9708aa6341
commit 6623d572aa
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
View File

@ -352,7 +352,7 @@ static int gizmo_axis_cursor_get(wmGizmo *UNUSED(gz))
return WM_CURSOR_DEFAULT;
}
static void gizmo_axis_bounds(bContext *C, wmGizmo *gz, rcti *r_bounding_box)
static void gizmo_axis_screen_bounds_get(bContext *C, wmGizmo *gz, rcti *r_bounding_box)
{
ScrArea *area = CTX_wm_area(C);
const float rad = WIDGET_RADIUS;
@ -371,7 +371,7 @@ void VIEW3D_GT_navigate_rotate(wmGizmoType *gzt)
gzt->draw = gizmo_axis_draw;
gzt->test_select = gizmo_axis_test_select;
gzt->cursor_get = gizmo_axis_cursor_get;
gzt->screen_bounds_get = gizmo_axis_bounds;
gzt->screen_bounds_get = gizmo_axis_screen_bounds_get;
gzt->struct_size = sizeof(wmGizmo);
}

7
source/blender/windowmanager/gizmo/WM_gizmo_types.h
View File

@ -371,7 +371,12 @@ typedef struct wmGizmoType {
*/
wmGizmoFnMatrixBasisGet matrix_basis_get;
/** Returns screen-space bounding box. Needed for nice tooltip placement. */
/**
* Returns screen-space bounding box in the window space
* (compatible with #wmEvent.x #wmEvent.y).
*
* Used for tool-tip placement (otherwise the cursor location is used).
*/
wmGizmoFnScreenBoundsGet screen_bounds_get;
/** Activate a gizmo state when the user clicks on it. */

6
source/blender/windowmanager/gizmo/wm_gizmo_fn.h
View File

@ -59,12 +59,12 @@ typedef int (*wmGizmoFnModal)(struct bContext *,
eWM_GizmoFlagTweak);
typedef void (*wmGizmoFnPropertyUpdate)(struct wmGizmo *, struct wmGizmoProperty *);
typedef void (*wmGizmoFnMatrixBasisGet)(const struct wmGizmo *, float[4][4]);
typedef void (*wmGizmoFnScreenBoundsGet)(struct bContext *,
struct wmGizmo *,
rcti *r_bounding_box);
typedef int (*wmGizmoFnInvoke)(struct bContext *, struct wmGizmo *, const struct wmEvent *);
typedef void (*wmGizmoFnExit)(struct bContext *, struct wmGizmo *, const bool);
typedef int (*wmGizmoFnCursorGet)(struct wmGizmo *);
typedef void (*wmGizmoFnScreenBoundsGet)(struct bContext *,
struct wmGizmo *,
rcti *r_bounding_box);
typedef void (*wmGizmoFnSelectRefresh)(struct wmGizmo *);
typedef void (*wmGizmoFnFree)(struct wmGizmo *);