Skip to content

Commit 516819f

Browse files
committed
Minor windowing changes
1 parent cd9e012 commit 516819f

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

src/main/java/the/bytecode/club/jda/gui/FileNavigationPane.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public void openFile(String name, String container, byte[] contents)
237237
{
238238
}
239239

240-
public static Dimension defaultDimension = new Dimension(350, -1);
240+
public static Dimension defaultDimension = new Dimension(350, -35);
241241
public static Point defaultPosition = new Point(0, 0);
242242
@Override
243243
public Dimension getDefaultSize()

src/main/java/the/bytecode/club/jda/gui/JDAWindow.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ public void componentMoved(ComponentEvent e)
6565
}
6666
});
6767

68-
addPropertyChangeListener(evt -> {
68+
addPropertyChangeListener(evt ->
69+
{
6970
if (isNormalState())
7071
{
7172
setSize(viewer.isMaximized? unmaximizedSize : smallUnmaxSize);
@@ -77,10 +78,12 @@ public void componentMoved(ComponentEvent e)
7778
public void onJDAResized() {
7879
smallUnmaxSize = new Dimension(unmaximizedSize);
7980
Dimension d = getDesktopPane().getSize();
80-
if (unmaximizedPos.getX() + smallUnmaxSize.width > d.width)
81-
smallUnmaxSize.width = d.width - (int) unmaximizedPos.getX();
82-
if (unmaximizedPos.getY() + smallUnmaxSize.height > d.height)
83-
smallUnmaxSize.height = d.height - (int) unmaximizedPos.getY();
81+
if (unmaximizedPos.getX() < d.width) {
82+
if (unmaximizedPos.getX() + smallUnmaxSize.width > d.width)
83+
smallUnmaxSize.width = d.width - (int) unmaximizedPos.getX();
84+
if (unmaximizedPos.getY() + smallUnmaxSize.height > d.height)
85+
smallUnmaxSize.height = d.height - (int) unmaximizedPos.getY();
86+
}
8487
if (isNormalState())
8588
setSize(smallUnmaxSize);
8689
}

src/main/java/the/bytecode/club/jda/gui/WorkPane.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void componentRemoved(final ContainerEvent e)
8787

8888
}
8989

90-
public static Dimension defaultDimension = new Dimension(-FileNavigationPane.defaultDimension.width, -1);
90+
public static Dimension defaultDimension = new Dimension(-FileNavigationPane.defaultDimension.width, -35);
9191
public static Point defaultPosition = new Point(FileNavigationPane.defaultDimension.width, 0);
9292
@Override
9393
public Dimension getDefaultSize()

0 commit comments

Comments
 (0)