diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-14 01:58:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-14 01:59:03 +0300 |
| commit | 3a58e97aed963b43984250e6ce40cd863b71e4b6 (patch) | |
| tree | 3ff086b75e7f9b82a556e455b728f0e56191510b /source/blender/editors/screen | |
| parent | daaabd076d125d7b61b00ff49fbca04bbf9c3129 (diff) | |
Fix T62526: Can't scroll redo panel
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/area.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index ad9bcaf59cc..a430ccdc95e 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1145,7 +1145,7 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, rct ar->overlap = ED_region_is_overlap(sa->spacetype, ar->regiontype); /* clear state flags first */ - ar->flag &= ~RGN_FLAG_TOO_SMALL; + ar->flag &= ~(RGN_FLAG_TOO_SMALL | RGN_FLAG_SIZE_CLAMP_X | RGN_FLAG_SIZE_CLAMP_Y); /* user errors */ if ((ar->next == NULL) && !ELEM(alignment, RGN_ALIGN_QSPLIT, RGN_ALIGN_FLOAT)) { alignment = RGN_ALIGN_NONE; @@ -1196,6 +1196,13 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, rct BLI_rcti_isect(&ar->winrct, &overlap_remainder_margin, &ar->winrct); + if (BLI_rcti_size_x(&ar->winrct) != prefsizex - 1) { + ar->flag |= RGN_FLAG_SIZE_CLAMP_X; + } + if (BLI_rcti_size_y(&ar->winrct) != prefsizey - 1) { + ar->flag |= RGN_FLAG_SIZE_CLAMP_Y; + } + /* We need to use a test that wont have been previously clamped. */ rcti winrct_test = { .xmin = ar->winrct.xmin, |