blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Cleanup: Rename confusing region variable 

`scaleare` reads like "scale area", but should read "scale region".
This commit is contained in:
Julian Eisel 2023-01-17 13:07:05 +01:00
parent 8082b96a75
commit 2c6ed49c03
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2586,21 +2586,21 @@ typedef struct RegionMoveData {
} RegionMoveData;
static int area_max_regionsize(ScrArea *area, ARegion *scalear, AZEdge edge)
static int area_max_regionsize(ScrArea *area, ARegion *scale_region, AZEdge edge)
{
int dist;
/* regions in regions. */
if (scalear->alignment & RGN_SPLIT_PREV) {
const int align = RGN_ALIGN_ENUM_FROM_MASK(scalear->alignment);
if (scale_region->alignment & RGN_SPLIT_PREV) {
const int align = RGN_ALIGN_ENUM_FROM_MASK(scale_region->alignment);
if (ELEM(align, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) {
ARegion *region = scalear->prev;
dist = region->winy + scalear->winy - U.pixelsize;
ARegion *region = scale_region->prev;
dist = region->winy + scale_region->winy - U.pixelsize;
}
else /* if (ELEM(align, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) */ {
ARegion *region = scalear->prev;
dist = region->winx + scalear->winx - U.pixelsize;
ARegion *region = scale_region->prev;
dist = region->winx + scale_region->winx - U.pixelsize;
}
}
else {
@ -2614,23 +2614,23 @@ static int area_max_regionsize(ScrArea *area, ARegion *scalear, AZEdge edge)
/* Subtract the width of regions on opposite side
* prevents dragging regions into other opposite regions. */
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
if (region == scalear) {
if (region == scale_region) {
continue;
}
if (scalear->alignment == RGN_ALIGN_LEFT && region->alignment == RGN_ALIGN_RIGHT) {
if (scale_region->alignment == RGN_ALIGN_LEFT && region->alignment == RGN_ALIGN_RIGHT) {
dist -= region->winx;
}
else if (scalear->alignment == RGN_ALIGN_RIGHT && region->alignment == RGN_ALIGN_LEFT) {
else if (scale_region->alignment == RGN_ALIGN_RIGHT && region->alignment == RGN_ALIGN_LEFT) {
dist -= region->winx;
}
else if (scalear->alignment == RGN_ALIGN_TOP &&
else if (scale_region->alignment == RGN_ALIGN_TOP &&
(region->alignment == RGN_ALIGN_BOTTOM ||
ELEM(
region->regiontype, RGN_TYPE_HEADER, RGN_TYPE_TOOL_HEADER, RGN_TYPE_FOOTER))) {
dist -= region->winy;
}
else if (scalear->alignment == RGN_ALIGN_BOTTOM &&
else if (scale_region->alignment == RGN_ALIGN_BOTTOM &&
(region->alignment == RGN_ALIGN_TOP ||
ELEM(
region->regiontype, RGN_TYPE_HEADER, RGN_TYPE_TOOL_HEADER, RGN_TYPE_FOOTER))) {