[Bf-blender-cvs] [5d8ff9ad918] temp-lanpr-staging: Fix T64888: full-screen button overlaps side-bar

Campbell Barton noreply at git.blender.org
Fri Aug 16 03:05:02 CEST 2019


Commit: 5d8ff9ad91878cdf3f5f0bf969a72477ba5a1e86
Author: Campbell Barton
Date:   Thu Aug 15 20:55:24 2019 +1000
Branches: temp-lanpr-staging
https://developer.blender.org/rB5d8ff9ad91878cdf3f5f0bf969a72477ba5a1e86

Fix T64888: full-screen button overlaps side-bar

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

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

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

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 3cf39b67054..d0a3382ee50 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -874,10 +874,19 @@ static void fullscreen_azone_initialize(ScrArea *sa, ARegion *ar)
   az->ar = ar;
   az->alpha = 0.0f;
 
-  az->x2 = ar->winrct.xmax;
-  az->y2 = ar->winrct.ymax;
+  if (U.uiflag2 & USER_REGION_OVERLAP) {
+    rcti rect_visible;
+    ED_region_visible_rect(ar, &rect_visible);
+    az->x2 = ar->winrct.xmin + rect_visible.xmax;
+    az->y2 = ar->winrct.ymin + rect_visible.ymax;
+  }
+  else {
+    az->x2 = ar->winrct.xmax;
+    az->y2 = ar->winrct.ymax;
+  }
   az->x1 = az->x2 - AZONEFADEOUT;
   az->y1 = az->y2 - AZONEFADEOUT;
+
   BLI_rcti_init(&az->rect, az->x1, az->x2, az->y1, az->y2);
 }



More information about the Bf-blender-cvs mailing list