[Bf-blender-cvs] [d6d79653073] master: Fix pin icon in Properties not right-aligned after zooming
Julian Eisel
noreply at git.blender.org
Wed Nov 18 19:51:18 CET 2020
Commit: d6d79653073944d58930717f6da2f35c38e49061
Author: Julian Eisel
Date: Wed Nov 18 19:49:20 2020 +0100
Branches: master
https://developer.blender.org/rBd6d79653073944d58930717f6da2f35c38e49061
Fix pin icon in Properties not right-aligned after zooming
The logic for separator-spacers (used here for right-alignment) didn't take
region scaling into account. Usually that's not an issue because they are
otherwise only used in headers which can't zoom.
===================================================================
M source/blender/editors/interface/interface.c
===================================================================
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 02e083076f0..1b87f5081b6 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -64,6 +64,7 @@
#include "UI_interface.h"
#include "UI_interface_icons.h"
+#include "UI_view2d.h"
#include "IMB_imbuf.h"
@@ -286,11 +287,12 @@ static void ui_update_flexible_spacing(const ARegion *region, uiBlock *block)
}
}
+ const float view_scale_x = UI_view2d_scale_get_x(®ion->v2d);
const float segment_width = region_width / (float)sepr_flex_len;
float offset = 0, remaining_space = region_width - buttons_width;
i = 0;
LISTBASE_FOREACH (uiBut *, but, &block->buttons) {
- BLI_rctf_translate(&but->rect, offset, 0);
+ BLI_rctf_translate(&but->rect, offset / view_scale_x, 0);
if (but->type == UI_BTYPE_SEPR_SPACER) {
/* How much the next block overlap with the current segment */
int overlap = ((i == sepr_flex_len - 1) ? buttons_width - spacers_pos[i] :
More information about the Bf-blender-cvs
mailing list