blender
/
blender
135
403
Fork 585
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

UI: increase corner splitting hit area to include screen edges. 

Differential Revision: https://developer.blender.org/D4242
This commit is contained in:
Harley Acheson 2019-02-21 17:04:20 +01:00 committed by Brecht Van Lommel
parent 1999651da5
commit a1e531ebbd
2 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/screen/area.c
View File

@ -752,25 +752,25 @@ static void area_azone_initialize(wmWindow *win, const bScreen *screen, ScrArea
float coords[4][4] = {
/* Bottom-left. */
{sa->totrct.xmin,
sa->totrct.ymin,
{sa->totrct.xmin - U.pixelsize,
sa->totrct.ymin - U.pixelsize,
sa->totrct.xmin + AZONESPOTW,
sa->totrct.ymin + AZONESPOTH},
/* Bottom-right. */
{sa->totrct.xmax - AZONESPOTW,
sa->totrct.ymin,
sa->totrct.xmax,
sa->totrct.ymin - U.pixelsize,
sa->totrct.xmax + U.pixelsize,
sa->totrct.ymin + AZONESPOTH},
/* Top-left. */
{sa->totrct.xmin,
{sa->totrct.xmin - U.pixelsize,
sa->totrct.ymax - AZONESPOTH,
sa->totrct.xmin + AZONESPOTW,
sa->totrct.ymax},
sa->totrct.ymax + U.pixelsize},
/* Top-right. */
{sa->totrct.xmax - AZONESPOTW,
sa->totrct.ymax - AZONESPOTH,
sa->totrct.xmax,
sa->totrct.ymax}};
sa->totrct.xmax + U.pixelsize,
sa->totrct.ymax + U.pixelsize}};
for (int i = 0; i < 4; i++) {
/* can't click on bottom corners on OS X, already used for resizing */

53
source/blender/editors/screen/screen_ops.c
View File

@ -645,15 +645,17 @@ typedef struct sActionzoneData {
static bool actionzone_area_poll(bContext *C)
{
wmWindow *win = CTX_wm_window(C);
ScrArea *sa = CTX_wm_area(C);
bScreen *screen = WM_window_get_active_screen(win);
if (sa && win && win->eventstate) {
if (screen && win && win->eventstate) {
const int *xy = &win->eventstate->x;
AZone *az;
for (az = sa->actionzones.first; az; az = az->next)
if (BLI_rcti_isect_pt_v(&az->rect, xy))
return 1;
for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
for (az = sa->actionzones.first; az; az = az->next)
if (BLI_rcti_isect_pt_v(&az->rect, xy))
return 1;
}
}
return 0;
}
@ -824,6 +826,31 @@ static AZone *area_actionzone_refresh_xy(ScrArea *sa, const int xy[2], const boo
return az;
}
/* Finds an actionzone by position in entire screen so azones can overlap */
static AZone *screen_actionzone_find_xy(bScreen *sc, const int xy[2])
{
for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) {
AZone *az = area_actionzone_refresh_xy(sa, xy, true);
if (az != NULL) {
return az;
}
}
return NULL;
}
/* Returns the area that the azone belongs to */
static ScrArea *screen_actionzone_area(bScreen *sc, const AZone *az)
{
for (ScrArea *area = sc->areabase.first; area; area = area->next) {
for (AZone *zone = area->actionzones.first; zone; zone = zone->next) {
if (zone == az) {
return area;
}
}
}
return NULL;
}
AZone *ED_area_actionzone_find_xy(ScrArea *sa, const int xy[2])
{
return area_actionzone_refresh_xy(sa, xy, true);
@ -869,8 +896,8 @@ static void actionzone_apply(bContext *C, wmOperator *op, int type)
static int actionzone_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
ScrArea *sa = CTX_wm_area(C);
AZone *az = ED_area_actionzone_find_xy(sa, &event->x);
bScreen *sc = CTX_wm_screen(C);
AZone *az = screen_actionzone_find_xy(sc, &event->x);
sActionzoneData *sad;
/* quick escape - Scroll azones only hide/unhide the scroll-bars, they have their own handling. */
@ -879,7 +906,7 @@ static int actionzone_invoke(bContext *C, wmOperator *op, const wmEvent *event)
/* ok we do the actionzone */
sad = op->customdata = MEM_callocN(sizeof(sActionzoneData), "sActionzoneData");
sad->sa1 = sa;
sad->sa1 = screen_actionzone_area(sc, az);
sad->az = az;
sad->x = event->x; sad->y = event->y;
@ -937,7 +964,7 @@ static int actionzone_modal(bContext *C, wmOperator *op, const wmEvent *event)
WM_window_screen_rect_calc(win, &screen_rect);
/* once we drag outside the actionzone, register a gesture
* check we're not on an edge so join finds the other area */
is_gesture = (delta_okay && (ED_area_actionzone_find_xy(sad->sa1, &event->x) != sad->az) &&
is_gesture = (delta_okay && (screen_actionzone_find_xy(sc, &event->x) != sad->az) &&
(screen_geom_area_map_find_active_scredge(
AREAMAP_FROM_SCREEN(sc), &screen_rect, event->x, event->y) == NULL));
}
@ -3105,10 +3132,10 @@ static int area_join_invoke(bContext *C, wmOperator *op, const wmEvent *event)
return OPERATOR_PASS_THROUGH;
/* prepare operator state vars */
RNA_int_set(op->ptr, "min_x", sad->x);
RNA_int_set(op->ptr, "min_y", sad->y);
RNA_int_set(op->ptr, "max_x", event->x);
RNA_int_set(op->ptr, "max_y", event->y);
RNA_int_set(op->ptr, "min_x", sad->sa1->totrct.xmin);
RNA_int_set(op->ptr, "min_y", sad->sa1->totrct.ymin);
RNA_int_set(op->ptr, "max_x", sad->sa2->totrct.xmin);
RNA_int_set(op->ptr, "max_y", sad->sa2->totrct.ymin);
}