fix bubble notifications having a width of 0
This commit is contained in:
parent
7d9ea309bf
commit
02632deff0
|
@ -513,7 +513,6 @@ public class MainMenu extends BaseOpsuState {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean mousePressed(int button, int x, int y) {
|
public boolean mousePressed(int button, int x, int y) {
|
||||||
//BubNotifListener.EVENT.make().onBubNotif("hi", Colors.BUB_ORANGE);
|
|
||||||
// check mouse button
|
// check mouse button
|
||||||
if (button == Input.MOUSE_MIDDLE_BUTTON)
|
if (button == Input.MOUSE_MIDDLE_BUTTON)
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -24,7 +24,6 @@ import org.newdawn.slick.Graphics;
|
||||||
import org.newdawn.slick.MouseListener;
|
import org.newdawn.slick.MouseListener;
|
||||||
import yugecin.opsudance.events.BubNotifListener;
|
import yugecin.opsudance.events.BubNotifListener;
|
||||||
import yugecin.opsudance.events.ResolutionChangedListener;
|
import yugecin.opsudance.events.ResolutionChangedListener;
|
||||||
import yugecin.opsudance.events.SkinChangedListener;
|
|
||||||
|
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -32,7 +31,7 @@ import java.util.ListIterator;
|
||||||
|
|
||||||
import static yugecin.opsudance.core.InstanceContainer.*;
|
import static yugecin.opsudance.core.InstanceContainer.*;
|
||||||
|
|
||||||
public class BubNotifState implements MouseListener, BubNotifListener, ResolutionChangedListener, SkinChangedListener {
|
public class BubNotifState implements MouseListener, BubNotifListener, ResolutionChangedListener {
|
||||||
|
|
||||||
public static final int IN_TIME = 633;
|
public static final int IN_TIME = 633;
|
||||||
public static final int DISPLAY_TIME = 7000 + IN_TIME;
|
public static final int DISPLAY_TIME = 7000 + IN_TIME;
|
||||||
|
@ -48,6 +47,7 @@ public class BubNotifState implements MouseListener, BubNotifListener, Resolutio
|
||||||
this.bubbles = new LinkedList<>();
|
this.bubbles = new LinkedList<>();
|
||||||
this.addAnimationTime = IN_TIME;
|
this.addAnimationTime = IN_TIME;
|
||||||
BubNotifListener.EVENT.addListener(this);
|
BubNotifListener.EVENT.addListener(this);
|
||||||
|
ResolutionChangedListener.EVENT.addListener(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void render(Graphics g) {
|
public void render(Graphics g) {
|
||||||
|
@ -73,7 +73,8 @@ public class BubNotifState implements MouseListener, BubNotifListener, Resolutio
|
||||||
}
|
}
|
||||||
|
|
||||||
private void calculatePositions() {
|
private void calculatePositions() {
|
||||||
Notification.width = (int) (displayContainer.width * 0.1703125f);
|
// if width is 0, attempting to wrap it will result in infinite loop
|
||||||
|
Notification.width = Math.max(50, (int) (displayContainer.width * 0.1703125f));
|
||||||
Notification.baseLine = (int) (displayContainer.height * 0.9645f);
|
Notification.baseLine = (int) (displayContainer.height * 0.9645f);
|
||||||
Notification.paddingY = (int) (displayContainer.height * 0.0144f);
|
Notification.paddingY = (int) (displayContainer.height * 0.0144f);
|
||||||
Notification.finalX = displayContainer.width - Notification.width - (int) (displayContainer.width * 0.01);
|
Notification.finalX = displayContainer.width - Notification.width - (int) (displayContainer.width * 0.01);
|
||||||
|
@ -130,11 +131,6 @@ public class BubNotifState implements MouseListener, BubNotifListener, Resolutio
|
||||||
calculatePositions();
|
calculatePositions();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSkinChanged(String stringName) {
|
|
||||||
calculatePositions();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean mouseWheelMoved(int delta) {
|
public boolean mouseWheelMoved(int delta) {
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user