Page MenuHome
Differential D4611 Diff 14527 source/blender/editors/screen/screen_ops.c

Changeset View

Standalone View

View Options

source/blender/editors/screen/screen_ops.c

Context not available.
} RegionMoveData; } RegionMoveData;
static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge) static int area_max_regionsize(ScrArea *sa, ARegion *scalear, AZEdge edge)
{ {
ARegion *ar; ARegion *ar;
int dist; int dist;
if (edge == AE_RIGHT_TO_TOPLEFT || edge == AE_LEFT_TO_TOPRIGHT) { /* regions in regions. */
dist = BLI_rcti_size_x(&sa->totrct); if (scalear->alignment & RGN_SPLIT_PREV) {
} const int align = scalear->alignment & ~RGN_SPLIT_PREV;
JacquesLuckeUnsubmitted
Not Done
Inline Actions

hmm, this will still break when another flag at a higher bit is added.
I understand that this is a tricky issue due to the mix of flags with non-flags in the same variable.

I'll fix it myself.

JacquesLucke: hmm, this will still break when another flag at a higher bit is added. I understand that this…
else { /* AE_BOTTOM_TO_TOPLEFT, AE_TOP_TO_BOTTOMRIGHT */
dist = BLI_rcti_size_y(&sa->totrct);
}
/* subtractwidth of regions on opposite side if (ELEM(align, RGN_ALIGN_TOP, RGN_ALIGN_BOTTOM)) {
* prevents dragging regions into other opposite regions */ ar = scalear->prev;
for (ar = sa->regionbase.first; ar; ar = ar->next) { dist = ar->winy + scalear->winy - U.pixelsize;
if (ar == scalear) }
continue; else if (ELEM(align, RGN_ALIGN_LEFT, RGN_ALIGN_RIGHT)) {
ar = scalear->prev;
JacquesLuckeUnsubmitted
Done
Inline Actions

style

JacquesLucke: style
dist = ar->winx + scalear->winx - U.pixelsize;
JacquesLuckeUnsubmitted
Done
Inline Actions

This will break when another flag is added in the future.
Better use a mask to get the lower bits only and then do the ELEM check.

JacquesLucke: This will break when another flag is added in the future. Better use a mask to get the lower…
}
}
else {
if (edge == AE_RIGHT_TO_TOPLEFT || edge == AE_LEFT_TO_TOPRIGHT) {
dist = BLI_rcti_size_x(&sa->totrct);
}
else { /* AE_BOTTOM_TO_TOPLEFT, AE_TOP_TO_BOTTOMRIGHT */
dist = BLI_rcti_size_y(&sa->totrct);
}
if (scalear->alignment == RGN_ALIGN_TOP && ar->alignment == RGN_ALIGN_BOTTOM) /* subtractwidth of regions on opposite side
dist -= ar->winy; * prevents dragging regions into other opposite regions */
else if (scalear->alignment == RGN_ALIGN_BOTTOM && ar->alignment == RGN_ALIGN_TOP) for (ar = sa->regionbase.first; ar; ar = ar->next) {
dist -= ar->winy; if (ar == scalear)
else if (scalear->alignment == RGN_ALIGN_LEFT && ar->alignment == RGN_ALIGN_RIGHT) continue;
dist -= ar->winx;
else if (scalear->alignment == RGN_ALIGN_RIGHT && ar->alignment == RGN_ALIGN_LEFT)
dist -= ar->winx;
/* case of regions in regions, like operator properties panel */ if (scalear->alignment == RGN_ALIGN_LEFT && ar->alignment == RGN_ALIGN_RIGHT) {
/* these can sit on top of other regions such as headers, so account for this */ dist -= ar->winx;
else if (edge == AE_BOTTOM_TO_TOPLEFT && scalear->alignment & RGN_ALIGN_TOP && }
ar->alignment == RGN_ALIGN_TOP && ar->regiontype == RGN_TYPE_HEADER) else if (scalear->alignment == RGN_ALIGN_RIGHT && ar->alignment == RGN_ALIGN_LEFT) {
{ dist -= ar->winx;
dist -= ar->winy; }
} else if (scalear->alignment == RGN_ALIGN_TOP &&
else if (edge == AE_TOP_TO_BOTTOMRIGHT && scalear->alignment & RGN_ALIGN_BOTTOM && (ar->alignment == RGN_ALIGN_BOTTOM || ar->regiontype == RGN_TYPE_HEADER)) {
ar->alignment == RGN_ALIGN_BOTTOM && ar->regiontype == RGN_TYPE_HEADER) dist -= ar->winy;
{ }
dist -= ar->winy; else if (scalear->alignment == RGN_ALIGN_BOTTOM &&
JacquesLuckeUnsubmitted
Done
Inline Actions

style: use spaces to indent a second line of the condition.

JacquesLucke: style: use spaces to indent a second line of the condition.
(ar->alignment == RGN_ALIGN_TOP || ar->regiontype == RGN_TYPE_HEADER)) {
dist -= ar->winy;
}
} }
} }
dist /= UI_DPI_FAC;
return dist; return dist;
} }
Context not available.
if (az->ar) { if (az->ar) {
RegionMoveData *rmd = MEM_callocN(sizeof(RegionMoveData), "RegionMoveData"); RegionMoveData *rmd = MEM_callocN(sizeof(RegionMoveData), "RegionMoveData");
int maxsize;
op->customdata = rmd; op->customdata = rmd;
Context not available.
rmd->origval = rmd->ar->sizey; rmd->origval = rmd->ar->sizey;
} }
GvgeoAuthorUnsubmitted
Done
Inline Actions

Header size is coded in other place, this part makes no difference anymore.

Gvgeo: Header size is coded in other place, this part makes no difference anymore.
GvgeoAuthorUnsubmitted
Done
Inline Actions

region_rect_recursive

Gvgeo: `region_rect_recursive`
/* limit headers to standard height for now */ CLAMP(rmd->maxsize, 0, 1000);
if (rmd->ar->regiontype == RGN_TYPE_HEADER)
maxsize = ED_area_headersize();
else
maxsize = 1000;
CLAMP(rmd->maxsize, 0, maxsize);
/* add temp handler */ /* add temp handler */
WM_event_add_modal_handler(C, op); WM_event_add_modal_handler(C, op);
Context not available.
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
static int region_scale_get_maxsize(RegionMoveData *rmd)
{
int maxsize = 0;
if (rmd->edge == AE_LEFT_TO_TOPRIGHT || rmd->edge == AE_RIGHT_TO_TOPLEFT) {
return (int) ( (rmd->sa->winx / UI_DPI_FAC) - UI_UNIT_X);
}
if (rmd->ar->regiontype == RGN_TYPE_TOOL_PROPS) {
/* this calculation seems overly verbose
* can someone explain why this method is necessary? - campbell */
const bool top_header = ED_area_header_alignment(rmd->sa) == RGN_ALIGN_TOP;
maxsize = rmd->maxsize - ((top_header) ? UI_UNIT_Y * 2 : UI_UNIT_Y) - (UI_UNIT_Y / 4);
}
return maxsize;
}
static void region_scale_validate_size(RegionMoveData *rmd) static void region_scale_validate_size(RegionMoveData *rmd)
{ {
if ((rmd->ar->flag & RGN_FLAG_HIDDEN) == 0) { if ((rmd->ar->flag & RGN_FLAG_HIDDEN) == 0) {
Context not available.
else else
size = &rmd->ar->sizey; size = &rmd->ar->sizey;
maxsize = region_scale_get_maxsize(rmd); maxsize = rmd->maxsize - (UI_UNIT_Y / UI_DPI_FAC);
if (*size > maxsize && maxsize > 0) if (*size > maxsize && maxsize > 0)
*size = maxsize; *size = maxsize;
Context not available.
} }
} }
else { else {
int maxsize = region_scale_get_maxsize(rmd);
delta = event->y - rmd->origy; delta = event->y - rmd->origy;
if (rmd->edge == AE_BOTTOM_TO_TOPLEFT) delta = -delta; if (rmd->edge == AE_BOTTOM_TO_TOPLEFT) delta = -delta;
Context not available.
if (!(rmd->ar->flag & RGN_FLAG_HIDDEN)) if (!(rmd->ar->flag & RGN_FLAG_HIDDEN))
region_scale_toggle_hidden(C, rmd); region_scale_toggle_hidden(C, rmd);
} }
else if (maxsize > 0 && (rmd->ar->sizey > maxsize)) {
rmd->ar->sizey = maxsize;
}
else if (rmd->ar->flag & RGN_FLAG_HIDDEN) { else if (rmd->ar->flag & RGN_FLAG_HIDDEN) {
region_scale_toggle_hidden(C, rmd); region_scale_toggle_hidden(C, rmd);
} }
Context not available.