blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

UI: initialize drag-lock x/y axis from region type 

When dragging in a vertical or horizontal region,
there is no need to detect the drag axis.

Gives minor usability improvement for dragging over vertical tabs.
This commit is contained in:
Campbell Barton 2018-11-23 19:12:34 +11:00
parent 4ed7c10a32
commit 2ded8fca79
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/editors/interface/interface_handlers.c
View File

@ -1249,11 +1249,12 @@ static bool ui_drag_toggle_but_is_pushed(uiBut *but)
typedef struct uiDragToggleHandle {
/* init */
bool is_init;
bool is_set;
float but_cent_start[2];
bool xy_lock[2];
bool is_xy_lock_init;
bool xy_lock[2];
int xy_init[2];
int xy_last[2];
} uiDragToggleHandle;
@ -1320,7 +1321,7 @@ static void ui_drag_toggle_set(bContext *C, uiDragToggleHandle *drag_info, const
* Check if we need to initialize the lock axis by finding if the first
* button we mouse over is X or Y aligned, then lock the mouse to that axis after.
*/
if (drag_info->is_init == false) {
if (drag_info->is_xy_lock_init == false) {
/* first store the buttons original coords */
uiBut *but = ui_but_find_mouse_over_ex(ar, xy_input[0], xy_input[1], true);
@ -1341,11 +1342,11 @@ static void ui_drag_toggle_set(bContext *C, uiDragToggleHandle *drag_info, const
else {
drag_info->xy_lock[1] = true;
}
drag_info->is_init = true;
drag_info->is_xy_lock_init = true;
}
}
else {
drag_info->is_init = true;
drag_info->is_xy_lock_init = true;
}
}
}
@ -1751,6 +1752,22 @@ static bool ui_but_drag_init(
drag_info, WM_HANDLER_BLOCKING);
CTX_wm_region_set(C, ar_prev);
/* Initialize alignment for single row/column regions,
* otherwise we use the relative position of the first other button dragged over. */
if (ELEM(data->region->regiontype, RGN_TYPE_NAV_BAR, RGN_TYPE_HEADER)) {
int lock_axis = -1;
if (ELEM(data->region->alignment, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) {
lock_axis = 0;
}
else if (ELEM(data->region->alignment, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) {
lock_axis = 1;
}
if (lock_axis != -1) {
drag_info->xy_lock[lock_axis] = true;
drag_info->is_xy_lock_init = true;
}
}
}
else
#endif