Skip to content

Fixed JTextArea Bug on mac and updated buttons  #93

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixed JTextArea Bug on mac and updated buttons  #93

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01f2120
JtextArea fix and Superscripts
jdrysdaleandesrson Mar 21, 2023
ace692b
Delete vcs.xml
jdrysdaleandesrson Mar 21, 2023
109d652
Delete ant.xml
jdrysdaleandesrson Mar 21, 2023
51e61e4
Delete workspace.xml
jdrysdaleandesrson Mar 21, 2023
5144837
Update UI.java
jdrysdaleandesrson Sep 2, 2023
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
14 changes: 7 additions & 7 deletions src/simplejavacalculator/UI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public UI() throws IOException {

font = new Font("Consolas",Font.PLAIN, 18);

text = new JTextArea(1, 30);
text = new JTextArea(1, 15);

textFont = new Font("Consolas",Font.BOLD, 24);

Expand All @@ -95,15 +95,15 @@ public UI() throws IOException {
butMinus = new JButton("-");
butMultiply = new JButton("*");
butDivide = new JButton("/");
butEqual = new JButton("=");
butSquareRoot = new JButton("sqrt");
butSquare = new JButton("x*x");
butOneDividedBy = new JButton("1/x");
butEqual = new JButton("=");
butSquareRoot = new JButton("<html>&#8730;x</html>");
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we avoid having html tags inside JButton…?
I wonder if there is any alternatives?

butSquare = new JButton("<html>x<sup>2</sup></html>");
butOneDividedBy = new JButton("<html>1 &#8260; x</html>");
butCos = new JButton("Cos");
butSin = new JButton("Sin");
butTan = new JButton("Tan");
butln = new JButton("ln");
butxpowerofy = new JButton("x^y");
butln = new JButton("ln");
butxpowerofy = new JButton("<html>x<sup>y</sup></html>");
butlog = new JButton("log10(x)");
butrate = new JButton("x%");
butabs = new JButton("abs(x)");
Expand Down