Skip to content

Commit

Permalink
#1114 Notifications: Fix notifications position
Browse files Browse the repository at this point in the history 
The position of the elements does not use the notification position
anymore. It uses the position where the notifications will be shown.

The following errors are fixed with this change:
- Fix old notifications shown not aligned with new notifications
when the window is moved
- Fix animation, it does not use the position of the notification
because if the animation is not finished, the position is not
correct. Previously, the position between the first and second
notification was not right if there were several notifications.
  • Loading branch information
@diego4zeiss
diego4zeiss committed Apr 5, 2019
1 parent 05a5f32 commit cfd4bcb
Showing 1 changed file with 31 additions and 17 deletions.
48 changes: 31 additions & 17 deletions controlsfx/src/main/java/org/controlsfx/control/Notifications.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2014, 2016, ControlsFX
* Copyright (c) 2014, 2019, ControlsFX
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -311,6 +311,7 @@ public void show() {
private static final class NotificationPopupHandler {

private static final NotificationPopupHandler INSTANCE = new NotificationPopupHandler();
private static final String FINAL_ANCHOR_Y = "finalAnchorY";

private double startX;
private double startY;
Expand All @@ -322,7 +323,8 @@ static final NotificationPopupHandler getInstance() {
}

private final Map<Pos, List<Popup>> popupsMap = new HashMap<>();
private final double padding = 15;
private static final double PADDING = 15;
private static final double SPACING = 15;

// for animating in the notifications
private ParallelTransition parallelTransition = new ParallelTransition();
Expand Down Expand Up @@ -476,7 +478,7 @@ public void relocateInParent(double x, double y) {
case BOTTOM_LEFT:
case BOTTOM_CENTER:
case BOTTOM_RIGHT:
popup.setAnchorY(y - padding);
popup.setAnchorY(y - PADDING);
break;
default:
// no-op
Expand Down Expand Up @@ -510,20 +512,20 @@ public void relocateInParent(double x, double y) {
case TOP_LEFT:
case CENTER_LEFT:
case BOTTOM_LEFT:
anchorX = padding + startX;
anchorX = PADDING + startX;
break;

case TOP_CENTER:
case CENTER:
case BOTTOM_CENTER:
anchorX = startX + (screenWidth / 2.0) - barWidth / 2.0 - padding / 2.0;
anchorX = startX + (screenWidth / 2.0) - barWidth / 2.0 - PADDING / 2.0;
break;

default:
case TOP_RIGHT:
case CENTER_RIGHT:
case BOTTOM_RIGHT:
anchorX = startX + screenWidth - barWidth - padding;
anchorX = startX + screenWidth - barWidth - PADDING;
break;
}

Expand All @@ -532,24 +534,25 @@ public void relocateInParent(double x, double y) {
case TOP_LEFT:
case TOP_CENTER:
case TOP_RIGHT:
anchorY = padding + startY;
anchorY = PADDING + startY;
break;

case CENTER_LEFT:
case CENTER:
case CENTER_RIGHT:
anchorY = startY + (screenHeight / 2.0) - barHeight / 2.0 - padding / 2.0;
anchorY = startY + (screenHeight / 2.0) - barHeight / 2.0 - PADDING / 2.0;
break;

default:
case BOTTOM_LEFT:
case BOTTOM_CENTER:
case BOTTOM_RIGHT:
anchorY = startY + screenHeight - barHeight - padding;
anchorY = startY + screenHeight - barHeight - PADDING;
break;
}

popup.setAnchorX(anchorX);
setFinalAnchorY(popup, anchorY);
popup.setAnchorY(anchorY);

isShowing = true;
Expand Down Expand Up @@ -610,8 +613,6 @@ private void doAnimation(Pos p, Popup changedPopup) {
return;
}

final double newPopupHeight = changedPopup.getContent().get(0).getBoundsInParent().getHeight();

parallelTransition.stop();
parallelTransition.getChildren().clear();

Expand All @@ -625,44 +626,57 @@ private void doAnimation(Pos p, Popup changedPopup) {
for (int i = popups.size() - 1; i >= 0; i--) {
Popup _popup = popups.get(i);

final double popupHeight = _popup.getContent().get(0).getBoundsInParent().getHeight();
final NotificationBar notificationBar = (NotificationBar) _popup.getContent().get(0);
final double popupHeight = notificationBar.minHeight(notificationBar.getWidth());

if (isShowFromTop) {
if (i == popups.size() - 1) {
sum = startY + newPopupHeight + padding;
sum = getFinalAnchorY(changedPopup) + popupHeight + SPACING;
} else {
sum += popupHeight;
sum += popupHeight + SPACING;
}
targetAnchors[i] = sum;
_popup.setAnchorY(sum-popupHeight);
} else {
if (i == popups.size() - 1) {
sum = changedPopup.getAnchorY() - popupHeight;
sum = getFinalAnchorY(changedPopup) - (popupHeight + SPACING);
} else {
sum -= popupHeight;
sum -= (popupHeight + SPACING);
}

targetAnchors[i] = sum;
_popup.setAnchorY(sum+popupHeight);
}
}

// then we set up animations for each popup to animate towards the
// target
for (int i = popups.size() - 1; i >= 0; i--) {
final Popup _popup = popups.get(i);
_popup.setAnchorX(changedPopup.getAnchorX());
final double anchorYTarget = targetAnchors[i];
if (anchorYTarget < 0) {
_popup.hide();
}
final double oldAnchorY = _popup.getAnchorY();
final double oldAnchorY = getFinalAnchorY(_popup);
final double distance = anchorYTarget - oldAnchorY;

setFinalAnchorY(_popup, oldAnchorY + distance);
Transition t = new CustomTransition(_popup, oldAnchorY, distance);
t.setCycleCount(1);
parallelTransition.getChildren().add(t);
}
parallelTransition.play();
}

private double getFinalAnchorY(Popup popup) {
return (double) popup.getProperties().get(FINAL_ANCHOR_Y);
}

private void setFinalAnchorY(Popup popup, double anchorY) {
popup.getProperties().put(FINAL_ANCHOR_Y, anchorY);
}

private boolean isShowFromTop(Pos p) {
switch (p) {
case TOP_LEFT:
Expand Down

0 comments on commit cfd4bcb

Please sign in to comment.