Skip to content

Added Close Button #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CarsenGafford2 wants to merge 1 commit into from
Closed

Added Close Button #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion app/src/main/java/kasio/view/CalculatorView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.awt.AWTException;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Image;
import java.awt.MenuItem;
import java.awt.PopupMenu;
Expand All @@ -21,6 +22,7 @@
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.KeyStroke;
import javax.swing.text.AbstractDocument;
Expand Down Expand Up @@ -101,6 +103,10 @@ public void mouseDragged(MouseEvent e) {
mode.setForeground(Colors.WHITE);
menuBar.add(mode, BorderLayout.WEST);

JPanel controls = new JPanel();
controls.setOpaque(false);
controls.setLayout(new FlowLayout(FlowLayout.RIGHT));

JButton minimize = new JButton("—");
minimize.setFont(Fonts.KEYPAD_PRIMARY);
minimize.setForeground(Colors.WHITE);
Expand All @@ -111,7 +117,21 @@ public void mouseDragged(MouseEvent e) {
e -> {
frame.setVisible(false);
});
menuBar.add(minimize, BorderLayout.EAST);
controls.add(minimize);

JButton close = new JButton("X");
close.setFont(Fonts.KEYPAD_PRIMARY);
close.setForeground(Colors.WHITE);
close.setBorderPainted(false);
close.setFocusable(false);
close.setContentAreaFilled(false);
close.addActionListener(
e -> {
System.exit(0);
});
controls.add(close);

menuBar.add(controls, BorderLayout.EAST);

JMenuItem basicMode = new JMenuItem("Basic");
basicMode.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK));
Expand Down
Loading