[Bf-blender-cvs] [8821757d0dd] master: Fix region action zone not working when hidden

Campbell Barton noreply at git.blender.org
Mon Apr 29 06:00:54 CEST 2019


Commit: 8821757d0dd038de15ccec6df595b3496d120167
Author: Campbell Barton
Date:   Mon Apr 29 13:47:11 2019 +1000
Branches: master
https://developer.blender.org/rB8821757d0dd038de15ccec6df595b3496d120167

Fix region action zone not working when hidden

Introduced in recent fix for T61554

===================================================================

M	source/blender/editors/screen/screen_ops.c

===================================================================

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 8e7475ec511..7e6f1dd2e4f 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -728,7 +728,9 @@ static bool azone_clipped_rect_calc(const AZone *az, rcti *r_rect_clip)
   const ARegion *ar = az->ar;
   *r_rect_clip = az->rect;
   if (az->type == AZONE_REGION) {
-    if (ar->overlap && (ar->v2d.keeptot != V2D_KEEPTOT_STRICT)) {
+    if (ar->overlap && (ar->v2d.keeptot != V2D_KEEPTOT_STRICT) &&
+        /* Only when this isn't hidden (where it's displayed as an button that expands). */
+        ((az->ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) == 0)) {
       /* A floating region to be resized, clip by the visible region. */
       switch (az->edge) {
         case AE_TOP_TO_BOTTOMRIGHT:



More information about the Bf-blender-cvs mailing list