Commit: 4705fafa7e3e197581acf6d391b03f0004fd7667
Author: Hans Goudey
Date: Thu Nov 26 10:29:03 2020 -0500
Branches: master
https://developer.blender.org/rB4705fafa7e3e197581acf6d391b03f0004fd7667
UI: Fix incorrect offset for panel label when zooming in
The panel title text intersected any buttons in the header because
the label offset retrieved from the layout code was not scaled by
the block's zoom level. Error in rB0d93bd8d63980.
===================================================================
M source/blender/editors/interface/interface_panel.c
===================================================================
diff --git a/source/blender/editors/interface/interface_panel.c
b/source/blender/editors/interface/interface_panel.c
index 514bc872b4a..5cfaafeec2c 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -1108,7 +1108,7 @@ static void panel_draw_aligned_widgets(const uiStyle
*style,
if (panel->drawname[0] != '\0') {
/* + 0.001f to avoid flirting with float inaccuracy .*/
const rcti title_rect = {
- .xmin = widget_rect.xmin + panel->labelofs + scaled_unit * 1.1f,
+ .xmin = widget_rect.xmin + (panel->labelofs / aspect) + scaled_unit *
1.1f,
.xmax = widget_rect.xmax,
.ymin = widget_rect.ymin - 2.0f / aspect,
.ymax = widget_rect.ymax,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
