TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 10:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TooltipPopup positioning.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-10-15 18:31:31 -04:00
parent 5b682a3a3d
commit 7193252d77
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/thoughtcrime/securesms/components/TooltipPopup.java
View File

@ -117,7 +117,7 @@ public class TooltipPopup extends PopupWindow {
switch (position) { switch (position) {
case POSITION_ABOVE: case POSITION_ABOVE:
xoffset = 0; xoffset = 0;
yoffset = -(2 * anchor.getWidth() + tooltipSpacing); yoffset = -(anchor.getHeight() + getContentView().getMeasuredHeight() + tooltipSpacing);
onLayout(() -> setArrowHorizontalPosition(arrow, anchor)); onLayout(() -> setArrowHorizontalPosition(arrow, anchor));
break; break;
case POSITION_BELOW: case POSITION_BELOW:
@ -128,10 +128,12 @@ public class TooltipPopup extends PopupWindow {
case POSITION_LEFT: case POSITION_LEFT:
xoffset = -getContentView().getMeasuredWidth() - tooltipSpacing; xoffset = -getContentView().getMeasuredWidth() - tooltipSpacing;
yoffset = -(getContentView().getMeasuredHeight()/2 + anchor.getHeight()/2); yoffset = -(getContentView().getMeasuredHeight()/2 + anchor.getHeight()/2);
onLayout(() -> setArrowVerticalPosition(arrow, anchor));
break; break;
case POSITION_RIGHT: case POSITION_RIGHT:
xoffset = anchor.getWidth() + tooltipSpacing; xoffset = anchor.getWidth() + tooltipSpacing;
yoffset = -(getContentView().getMeasuredHeight()/2 + anchor.getHeight()/2); yoffset = -(getContentView().getMeasuredHeight()/2 + anchor.getHeight()/2);
onLayout(() -> setArrowVerticalPosition(arrow, anchor));
break; break;
default: default:
throw new AssertionError("Invalid tooltip position!"); throw new AssertionError("Invalid tooltip position!");
@ -154,7 +156,14 @@ public class TooltipPopup extends PopupWindow {
int arrowCenterX = getAbsolutePosition(arrow)[0] + arrow.getWidth()/2; int arrowCenterX = getAbsolutePosition(arrow)[0] + arrow.getWidth()/2;
int anchorCenterX = getAbsolutePosition(anchor)[0] + anchor.getWidth()/2; int anchorCenterX = getAbsolutePosition(anchor)[0] + anchor.getWidth()/2;
arrow.setX(anchorCenterX - arrowCenterX); arrow.setTranslationX(anchorCenterX - arrowCenterX);
}
private static void setArrowVerticalPosition(@NonNull View arrow, @NonNull View anchor) {
int arrowCenterY = getAbsolutePosition(arrow)[1] + arrow.getHeight()/2;
int anchorCenterY = getAbsolutePosition(anchor)[1] + anchor.getHeight()/2;
arrow.setTranslationY(anchorCenterY - arrowCenterY);
} }
private static int[] getAbsolutePosition(@NonNull View view) { private static int[] getAbsolutePosition(@NonNull View view) {