gered/Llanfair
Archived
1
0
Fork 0
Code Issues 9 Pull requests Packages Projects Releases 5 Wiki Activity

fix BorderlessFrame window resizing to respect isResizable

Browse source
This commit is contained in:
Gered 2016-01-16 12:30:22 -05:00
parent b0a2945ddc
commit 684c924cec
1 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/main/java/org/fenix/utils/gui/BorderlessFrame.java
View file

@ -49,7 +49,7 @@ public class BorderlessFrame extends JFrame implements MouseListener, MouseMotio
} }
public void mousePressed(MouseEvent event) { public void mousePressed(MouseEvent event) {
if(this.getCursor().getType() != 0) { if(this.getCursor().getType() != Cursor.DEFAULT_CURSOR && this.isResizable()) {
this.doResize = true; this.doResize = true;
this.startFrameX = this.getX(); this.startFrameX = this.getX();
this.startFrameY = this.getY(); this.startFrameY = this.getY();
@ -79,31 +79,31 @@ public class BorderlessFrame extends JFrame implements MouseListener, MouseMotio
int height = this.getHeight(); int height = this.getHeight();
int frameX = this.startFrameX; int frameX = this.startFrameX;
int frameY = this.startFrameY; int frameY = this.startFrameY;
if(type == 5) { if(type == Cursor.SE_RESIZE_CURSOR) {
width = event.getXOnScreen() - this.startFrameX; width = event.getXOnScreen() - this.startFrameX;
height = event.getYOnScreen() - this.startFrameY; height = event.getYOnScreen() - this.startFrameY;
} else if(type == 11) { } else if(type == Cursor.E_RESIZE_CURSOR) {
width = event.getXOnScreen() - this.startFrameX; width = event.getXOnScreen() - this.startFrameX;
} else if(type == 7) { } else if(type == Cursor.NE_RESIZE_CURSOR) {
width = event.getXOnScreen() - this.startFrameX; width = event.getXOnScreen() - this.startFrameX;
height = this.startFrameY + this.startHeight - event.getYOnScreen(); height = this.startFrameY + this.startHeight - event.getYOnScreen();
frameY = event.getYOnScreen(); frameY = event.getYOnScreen();
} else if(type == 8) { } else if(type == Cursor.N_RESIZE_CURSOR) {
height = this.startFrameY + this.startHeight - event.getYOnScreen(); height = this.startFrameY + this.startHeight - event.getYOnScreen();
frameY = event.getYOnScreen(); frameY = event.getYOnScreen();
} else if(type == 6) { } else if(type == Cursor.NW_RESIZE_CURSOR) {
width = this.startFrameX + this.startWidth - event.getXOnScreen(); width = this.startFrameX + this.startWidth - event.getXOnScreen();
height = this.startFrameY + this.startHeight - event.getYOnScreen(); height = this.startFrameY + this.startHeight - event.getYOnScreen();
frameY = event.getYOnScreen(); frameY = event.getYOnScreen();
frameX = event.getXOnScreen(); frameX = event.getXOnScreen();
} else if(type == 10) { } else if(type == Cursor.W_RESIZE_CURSOR) {
width = this.startFrameX + this.startWidth - event.getXOnScreen(); width = this.startFrameX + this.startWidth - event.getXOnScreen();
frameX = event.getXOnScreen(); frameX = event.getXOnScreen();
} else if(type == 4) { } else if(type == Cursor.SW_RESIZE_CURSOR) {
width = this.startFrameX + this.startWidth - event.getXOnScreen(); width = this.startFrameX + this.startWidth - event.getXOnScreen();
height = event.getYOnScreen() - this.startFrameY; height = event.getYOnScreen() - this.startFrameY;
frameX = event.getXOnScreen(); frameX = event.getXOnScreen();
} else if(type == 9) { } else if(type == Cursor.S_RESIZE_CURSOR) {
height = event.getYOnScreen() - this.startFrameY; height = event.getYOnScreen() - this.startFrameY;
} }
@ -130,28 +130,32 @@ public class BorderlessFrame extends JFrame implements MouseListener, MouseMotio
int lowSnapY = this.getY() + this.snapSize; int lowSnapY = this.getY() + this.snapSize;
int mouseX = event.getXOnScreen(); int mouseX = event.getXOnScreen();
int mouseY = event.getYOnScreen(); int mouseY = event.getYOnScreen();
if (this.isResizable()) {
if (mouseX > farSnapX) { if (mouseX > farSnapX) {
if (mouseY > farSnapY) { if (mouseY > farSnapY) {
this.changeCursor(5); this.changeCursor(Cursor.SE_RESIZE_CURSOR);
} else if (mouseY < lowSnapY) { } else if (mouseY < lowSnapY) {
this.changeCursor(7); this.changeCursor(Cursor.NE_RESIZE_CURSOR);
} else { } else {
this.changeCursor(11); this.changeCursor(Cursor.E_RESIZE_CURSOR);
} }
} else if (mouseX < lowSnapX) { } else if (mouseX < lowSnapX) {
if (mouseY < lowSnapY) { if (mouseY < lowSnapY) {
this.changeCursor(6); this.changeCursor(Cursor.NW_RESIZE_CURSOR);
} else if (mouseY > farSnapY) { } else if (mouseY > farSnapY) {
this.changeCursor(4); this.changeCursor(Cursor.SW_RESIZE_CURSOR);
} else { } else {
this.changeCursor(10); this.changeCursor(Cursor.W_RESIZE_CURSOR);
} }
} else if (mouseY > farSnapY) { } else if (mouseY > farSnapY) {
this.changeCursor(9); this.changeCursor(Cursor.S_RESIZE_CURSOR);
} else if (mouseY < lowSnapY) { } else if (mouseY < lowSnapY) {
this.changeCursor(8); this.changeCursor(Cursor.N_RESIZE_CURSOR);
} else { } else {
this.changeCursor(0); this.changeCursor(Cursor.DEFAULT_CURSOR);
}
} else {
this.changeCursor(Cursor.DEFAULT_CURSOR);
} }
} }