Commit: f35572ae9e45929a0d2852e52a78613cc3f3418f
Author: Campbell Barton
Date: Thu Jun 14 11:37:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf35572ae9e45929a0d2852e52a78613cc3f3418f
Cleanup: style
===================================================================
M source/blender/editors/interface/interface.c
===================================================================
diff --git a/source/blender/editors/interface/interface.c
b/source/blender/editors/interface/interface.c
index b592a75c0d3..cc3f450a99d 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -268,9 +268,11 @@ static void ui_update_flexible_spacing(const ARegion
*region, uiBlock *block)
BLI_rctf_translate(&but->rect, offset, 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]
- :
(spacers_pos[i+1] - spacers_pos[i]) / 2;
- int segment_end = segment_width * (i+1);
+ int overlap = (
+ (i == sepr_flex_len - 1) ?
+ buttons_width - spacers_pos[i] :
+ (spacers_pos[i + 1] - spacers_pos[i]) / 2);
+ int segment_end = segment_width * (i + 1);
int spacer_end = segment_end - overlap;
int spacer_sta = spacers_pos[i] + offset;
if (spacer_end > spacer_sta) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
