[Bf-blender-cvs] [4b20eebb85c] master: UI: only draw a single header in the header region

Campbell Barton noreply at git.blender.org
Thu Sep 17 06:43:56 CEST 2020


Commit: 4b20eebb85cc5b1e6417c37cdc3c536e4ae7edb9
Author: Campbell Barton
Date:   Thu Sep 17 14:40:30 2020 +1000
Branches: master
https://developer.blender.org/rB4b20eebb85cc5b1e6417c37cdc3c536e4ae7edb9

UI: only draw a single header in the header region

While this isn't an issue with the default configuration it's possible
to register extra header types for a single region.

In this case the first header-type to successfully poll is drawn
without drawing other header types.

This issue was raised by T60195.

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

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

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

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index 58251bbb6d9..f06633c1c92 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -3137,6 +3137,10 @@ void ED_region_header_layout(const bContext *C, ARegion *region)
     }
 
     UI_block_end(C, block);
+
+    /* In most cases there is only ever one header, it never makes sense to draw more than one
+     * header in the same region, this results in overlapping buttons, see: T60195. */
+    break;
   }
 
   if (!region_layout_based) {



More information about the Bf-blender-cvs mailing list