griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Increase Hit Size of the Close Region Action Zone

Browse Source 
When regions are closed, like sidebars and toolbars, we show a little
arrow at the edge. This PR does not change that arrow, nor make any
noticable visual change, but almost doubles the hit size area. Much
easier to hit, especially with a tablet pen.  It also changes the mouse
cursor when hovering over it to ones that indicate movement in that one
direction, helping to reinforce that you are over the spot. Otherwise
the mouse cursor looks the same as when over the nearby edge.

Pull Request: https://projects.blender.org/blender/blender/pulls/136334
This commit is contained in:
Harley Acheson
2025-03-24 20:04:28 +01:00
committed by Harley Acheson
parent 0f9ef0eefc
commit daa417d304
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/editors/screen/area.cc
View File

@@ -282,10 +282,11 @@ static void region_draw_azone_tab_arrow(ScrArea *area, ARegion *region, AZone *a
float alpha = WM_region_use_viewport(area, region) ? 0.6f : 0.4f;
const float color[4] = {0.05f, 0.05f, 0.05f, alpha};
rctf rect{};
rect.xmin = float(az->x1);
rect.xmax = float(az->x2);
rect.ymin = float(az->y1);
rect.ymax = float(az->y2);
/* Hit size is a bit larger than visible background. */
rect.xmin = float(az->x1) + U.pixelsize;
rect.xmax = float(az->x2) - U.pixelsize;
rect.ymin = float(az->y1) + U.pixelsize;
rect.ymax = float(az->y2) - U.pixelsize;
UI_draw_roundbox_aa(&rect, true, 4.0f, color);
draw_azone_arrow(float(az->x1), float(az->y1), float(az->x2), float(az->y2), az->edge);
@@ -1150,14 +1151,14 @@ static void region_azone_edge(const ScrArea *area, AZone *az, const ARegion *reg
static void region_azone_tab_plus(ScrArea *area, AZone *az, ARegion *region)
{
float edge_offset = 1.0f;
const float tab_size_x = 0.7f * U.widget_unit;
const float tab_size_y = 0.4f * U.widget_unit;
const float tab_size_x = 1.0f * U.widget_unit;
const float tab_size_y = 0.5f * U.widget_unit;
switch (az->edge) {
case AE_TOP_TO_BOTTOMRIGHT: {
int add = (region->winrct.ymax == area->totrct.ymin) ? 1 : 0;
az->x1 = region->winrct.xmax - ((edge_offset + 1.0f) * tab_size_x);
az->y1 = region->winrct.ymax - add;
az->y1 = region->winrct.ymax - U.pixelsize;
az->x2 = region->winrct.xmax - (edge_offset * tab_size_x);
az->y2 = region->winrct.ymax - add + tab_size_y;
break;
@@ -1166,16 +1167,16 @@ static void region_azone_tab_plus(ScrArea *area, AZone *az, ARegion *region)
az->x1 = region->winrct.xmax - ((edge_offset + 1.0f) * tab_size_x);
az->y1 = region->winrct.ymin - tab_size_y;
az->x2 = region->winrct.xmax - (edge_offset * tab_size_x);
az->y2 = region->winrct.ymin;
az->y2 = region->winrct.ymin + U.pixelsize;
break;
case AE_LEFT_TO_TOPRIGHT:
az->x1 = region->winrct.xmin - tab_size_y;
az->y1 = region->winrct.ymax - ((edge_offset + 1.0f) * tab_size_x);
az->x2 = region->winrct.xmin;
az->x2 = region->winrct.xmin + U.pixelsize;
az->y2 = region->winrct.ymax - (edge_offset * tab_size_x);
break;
case AE_RIGHT_TO_TOPLEFT:
az->x1 = region->winrct.xmax;
az->x1 = region->winrct.xmax - U.pixelsize;
az->y1 = region->winrct.ymax - ((edge_offset + 1.0f) * tab_size_x);
az->x2 = region->winrct.xmax + tab_size_y;
az->y2 = region->winrct.ymax - (edge_offset * tab_size_x);

22
source/blender/editors/screen/screen_edit.cc
View File

@@ -1057,11 +1057,27 @@ static void screen_cursor_set(wmWindow *win, const int xy[2])
WM_cursor_set(win, WM_CURSOR_EDIT);
}
else if (az->type == AZONE_REGION) {
if (ELEM(az->edge, AE_LEFT_TO_TOPRIGHT, AE_RIGHT_TO_TOPLEFT)) {
WM_cursor_set(win, WM_CURSOR_X_MOVE);
const bool is_hidden = (az->region->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL));
if (is_hidden) {
switch (az->edge) {
case AE_LEFT_TO_TOPRIGHT:
WM_cursor_set(win, WM_CURSOR_W_ARROW);
break;
case AE_RIGHT_TO_TOPLEFT:
WM_cursor_set(win, WM_CURSOR_E_ARROW);
break;
case AE_TOP_TO_BOTTOMRIGHT:
WM_cursor_set(win, WM_CURSOR_N_ARROW);
break;
case AE_BOTTOM_TO_TOPLEFT:
WM_cursor_set(win, WM_CURSOR_S_ARROW);
break;
}
}
else {
WM_cursor_set(win, WM_CURSOR_Y_MOVE);
WM_cursor_set(win,
ELEM(az->edge, AE_LEFT_TO_TOPRIGHT, AE_RIGHT_TO_TOPLEFT) ? WM_CURSOR_X_MOVE :
WM_CURSOR_Y_MOVE);
}
}
}