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

Always show Full Screen button right of Minimize button

Browse Source
This commit is contained in:
drdev
2013-10-07 05:23:43 +00:00
parent 1e5244cee0
commit 2fa44e1ae2
1 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/main/java/forge/view/FTitleBarBase.java
View File

@@ -37,8 +37,8 @@ public abstract class FTitleBarBase extends JMenuBar {
protected final JComponentSkin<FTitleBarBase> skin = FSkin.get(this); protected final JComponentSkin<FTitleBarBase> skin = FSkin.get(this);
protected final SpringLayout layout = new SpringLayout(); protected final SpringLayout layout = new SpringLayout();
protected final LockTitleBarButton btnLockTitleBar = new LockTitleBarButton(); protected final LockTitleBarButton btnLockTitleBar = new LockTitleBarButton();
protected final FullScreenButton btnFullScreen = new FullScreenButton();
protected final MinimizeButton btnMinimize = new MinimizeButton(); protected final MinimizeButton btnMinimize = new MinimizeButton();
protected final FullScreenButton btnFullScreen = new FullScreenButton();
protected final MaximizeButton btnMaximize = new MaximizeButton(); protected final MaximizeButton btnMaximize = new MaximizeButton();
protected final CloseButton btnClose = new CloseButton(); protected final CloseButton btnClose = new CloseButton();
@@ -59,13 +59,13 @@ public abstract class FTitleBarBase extends JMenuBar {
layout.putConstraint(SpringLayout.EAST, btnMaximize, 0, SpringLayout.WEST, btnClose); layout.putConstraint(SpringLayout.EAST, btnMaximize, 0, SpringLayout.WEST, btnClose);
layout.putConstraint(SpringLayout.SOUTH, btnMaximize, 0, SpringLayout.SOUTH, btnClose); layout.putConstraint(SpringLayout.SOUTH, btnMaximize, 0, SpringLayout.SOUTH, btnClose);
add(btnMinimize);
layout.putConstraint(SpringLayout.EAST, btnMinimize, 0, SpringLayout.WEST, btnMaximize);
layout.putConstraint(SpringLayout.SOUTH, btnMinimize, 0, SpringLayout.SOUTH, btnMaximize);
add(btnFullScreen); add(btnFullScreen);
layout.putConstraint(SpringLayout.EAST, btnFullScreen, 0, SpringLayout.WEST, btnMinimize); layout.putConstraint(SpringLayout.EAST, btnFullScreen, 0, SpringLayout.WEST, btnMaximize);
layout.putConstraint(SpringLayout.SOUTH, btnFullScreen, 0, SpringLayout.SOUTH, btnMinimize); layout.putConstraint(SpringLayout.SOUTH, btnFullScreen, 0, SpringLayout.SOUTH, btnMaximize);
add(btnMinimize);
layout.putConstraint(SpringLayout.EAST, btnMinimize, 0, SpringLayout.WEST, btnFullScreen);
layout.putConstraint(SpringLayout.SOUTH, btnMinimize, 0, SpringLayout.SOUTH, btnFullScreen);
add(btnLockTitleBar); add(btnLockTitleBar);
layout.putConstraint(SpringLayout.EAST, btnLockTitleBar, 0, SpringLayout.WEST, btnMinimize); layout.putConstraint(SpringLayout.EAST, btnLockTitleBar, 0, SpringLayout.WEST, btnMinimize);
@@ -93,7 +93,7 @@ public abstract class FTitleBarBase extends JMenuBar {
btnLockTitleBar.repaintSelf(); btnLockTitleBar.repaintSelf();
} }
else { else {
layout.putConstraint(SpringLayout.EAST, btnFullScreen, 0, SpringLayout.WEST, btnMinimize); layout.putConstraint(SpringLayout.EAST, btnFullScreen, 0, SpringLayout.WEST, btnMaximize);
btnFullScreen.setToolTipText("Full Screen (F11)"); btnFullScreen.setToolTipText("Full Screen (F11)");
if (frame.isMaximized()) { if (frame.isMaximized()) {
btnMaximize.setToolTipText("Restore Down"); btnMaximize.setToolTipText("Restore Down");
@@ -225,6 +225,32 @@ public abstract class FTitleBarBase extends JMenuBar {
} }
} }
public class MinimizeButton extends TitleBarButton {
private MinimizeButton() {
setToolTipText("Minimize");
}
@Override
protected void onClick() {
frame.setMinimized(true);
}
@Override
public void paintComponent(Graphics g) {
super.paintComponent(g);
int thickness = 2;
int offsetX = 8;
int offsetY = 7;
int x1 = offsetX;
int x2 = getWidth() - offsetX;
int y = getHeight() - offsetY - thickness;
Graphics2D g2d = (Graphics2D) g;
skin.setGraphicsColor(g2d, foreColor);
g2d.setStroke(new BasicStroke(thickness));
g2d.drawLine(x1, y, x2, y);
}
}
public class FullScreenButton extends TitleBarButton { public class FullScreenButton extends TitleBarButton {
private FullScreenButton() { private FullScreenButton() {
//Tooltip set in updateButtons() //Tooltip set in updateButtons()
@@ -283,32 +309,6 @@ public abstract class FTitleBarBase extends JMenuBar {
} }
} }
public class MinimizeButton extends TitleBarButton {
private MinimizeButton() {
setToolTipText("Minimize");
}
@Override
protected void onClick() {
frame.setMinimized(true);
}
@Override
public void paintComponent(Graphics g) {
super.paintComponent(g);
int thickness = 2;
int offsetX = 8;
int offsetY = 7;
int x1 = offsetX;
int x2 = getWidth() - offsetX;
int y = getHeight() - offsetY - thickness;
Graphics2D g2d = (Graphics2D) g;
skin.setGraphicsColor(g2d, foreColor);
g2d.setStroke(new BasicStroke(thickness));
g2d.drawLine(x1, y, x2, y);
}
}
public class MaximizeButton extends TitleBarButton { public class MaximizeButton extends TitleBarButton {
private MaximizeButton() { private MaximizeButton() {
//Tooltip set in updateButtons() //Tooltip set in updateButtons()