external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move setShape call from paint to resize listener rather to hopefully fix Linux issue

Browse Source 
Make FDialog border non-rounded if setShape isn't supported (Mac)
This commit is contained in:
drdev
2013-12-24 18:11:09 +00:00
parent 7a906fdc03
commit f7d1b73a6c
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui/src/main/java/forge/gui/menus/LayoutMenu.java
View File

@@ -202,8 +202,7 @@ public final class LayoutMenu {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
String[] options = {"800x600", "1024x768", "1280x720"}; String[] options = {"800x600", "1024x768", "1280x720"};
final String choice = GuiChoose.oneOrNone("Choose new window size", options); final String choice = GuiChoose.oneOrNone("Choose new window size", options);
if (choice != null) if (choice != null) {
{
String[] dims = choice.split("x"); String[] dims = choice.split("x");
Singletons.getView().getFrame().setSize(Integer.parseInt(dims[0]), Integer.parseInt(dims[1])); Singletons.getView().getFrame().setSize(Integer.parseInt(dims[0]), Integer.parseInt(dims[1]));
} }

28
forge-gui/src/main/java/forge/view/FDialog.java
View File

@@ -11,6 +11,8 @@ import java.awt.Point;
import java.awt.PopupMenu; import java.awt.PopupMenu;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.GraphicsDevice.WindowTranslucency; import java.awt.GraphicsDevice.WindowTranslucency;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter; import java.awt.event.MouseMotionAdapter;
@@ -62,26 +64,32 @@ public class FDialog extends JDialog implements ITitleBarOwner {
this.titleBar = new FTitleBar(this); this.titleBar = new FTitleBar(this);
this.titleBar.setVisible(true); this.titleBar.setVisible(true);
addMoveSupport(); addMoveSupport();
if (isSetShapeSupported) { //if possible, set rounded rectangle shape for dialog
this.addComponentListener(new ComponentAdapter() {
@Override
public void componentResized(final ComponentEvent e) { //must update shape whenever dialog is resized
int arc = cornerDiameter - 4; //leave room for border aliasing
FDialog.this.setShape(new RoundRectangle2D.Float(0, 0, FDialog.this.getWidth(), FDialog.this.getHeight(), arc, arc));
}
});
}
} }
@Override @Override
public void paint(Graphics g) { public void paint(Graphics g) {
int width = this.getWidth();
int height = this.getHeight();
//set rounded rectangle shape for dialog if possible
if (isSetShapeSupported) {
int arc = cornerDiameter - 4; //leave room for border aliasing
this.setShape(new RoundRectangle2D.Float(0, 0, width, height, arc, arc));
}
super.paint(g); super.paint(g);
//draw rounded border //draw rounded border
final Graphics2D g2d = (Graphics2D) g.create(); final Graphics2D g2d = (Graphics2D) g.create();
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
skin.setGraphicsColor(g2d, borderColor); skin.setGraphicsColor(g2d, borderColor);
g2d.drawRoundRect(0, 0, width - 1, height - 1, cornerDiameter, cornerDiameter); if (isSetShapeSupported) {
g2d.drawRoundRect(0, 0, this.getWidth() - 1, this.getHeight() - 1, cornerDiameter, cornerDiameter);
}
else { //draw non-rounded border instead if setShape isn't supported
g2d.drawRect(0, 0, this.getWidth() - 1, this.getHeight() - 1);
}
g2d.dispose(); g2d.dispose();
} }