[Bf-blender-cvs] [668867558e6] blender-v2.83-release: UI: apply vertical tool-tip offset in pixel-space
Campbell Barton
noreply at git.blender.org
Mon May 11 10:30:22 CEST 2020
Commit: 668867558e68b064c507b1f23508b65b0343f0f1
Author: Campbell Barton
Date: Mon May 11 18:28:41 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rB668867558e68b064c507b1f23508b65b0343f0f1
UI: apply vertical tool-tip offset in pixel-space
Was applying in ui-block space which changed offset
at different zoom levels.
===================================================================
M source/blender/editors/interface/interface_region_tooltip.c
===================================================================
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index 58a13c6c456..b64f080d9cc 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -756,7 +756,7 @@ static uiTooltipData *ui_tooltip_data_from_tool(bContext *C, uiBut *but, bool is
}
}
#else
- UNUSED_VARS(is_label);
+ UNUSED_VARS(is_label, has_valid_context, has_valid_context_error);
#endif /* WITH_PYTHON */
if (data->fields_len == 0) {
@@ -1451,11 +1451,12 @@ ARegion *UI_tooltip_create_from_button(bContext *C, ARegion *butregion, uiBut *b
}
else {
init_position[0] = BLI_rctf_cent_x(&but->rect);
- init_position[1] = but->rect.ymin - (UI_POPUP_MARGIN / 2);
+ init_position[1] = but->rect.ymin;
if (butregion) {
ui_block_to_window_fl(butregion, but->block, &init_position[0], &init_position[1]);
init_position[0] = win->eventstate->x;
}
+ init_position[1] -= (UI_POPUP_MARGIN / 2);
}
ARegion *region = ui_tooltip_create_with_data(
More information about the Bf-blender-cvs
mailing list