Skip to content

Yadav1 #27

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

Merged
BobHanson merged 3 commits into from
Jun 24, 2018
Merged

Yadav1 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17f3678
Window opacity restored after moving to subclass JComponent
BobHanson Jun 24, 2018
0b2dfe3
typo in synchronized() fix
BobHanson Jun 24, 2018
6839b1d
typo in HTML5LookAndFeel
BobHanson Jun 24, 2018
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
Binary file modified sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
Binary file modified sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ public boolean visit(SynchronizedStatement node) {
// checking that it is not null
buffer.append("if(!(");
node.getExpression().accept(this);
buffer.append("){throw new NullPointerException()}else");
buffer.append(")){throw new NullPointerException()}else");
node.getBody().accept(this);
return false;
}
Expand Down
Binary file modified sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
17 changes: 14 additions & 3 deletions sources/net.sf.j2s.java.core/src/java/awt/Window.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@
import swingjs.JSUtil;

/**
*
* SWINGJS NOTE! As of 6/23/2018 java.awt.Window has been moved to
* subclass JComponent. It is fair to say that there will be issues
* with this, but the reason was to allow JInternalFrame to subclass JFrame
* instead of duplicating in code all of its functionality.
*
*
* A <code>Window</code> object is a top-level window with no borders and no
* menubar.
* The default layout for a window is <code>BorderLayout</code>.
Expand Down Expand Up @@ -3353,10 +3360,14 @@ public void setBackground(Color bgColor) {
}
*/

@SuppressWarnings("unused")
private transient boolean opaque = true;
private boolean opaque = true;

public boolean isOpaque() {
// SwingJS
return opaque;
}

public void setOpaque(boolean opaque) {
public void setOpaque(boolean opaque) {
synchronized (getTreeLock()) {
//TODO ?
// GraphicsConfiguration gc = getGraphicsConfiguration();
Expand Down
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.java.core/src/swingjs/plaf/HTML5LookAndFeel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ public Object createValue(UIDefaults table) {

"Desktop.minOnScreenInsets", threeInsets,
"Desktop.background", table.get("desktop"),
"Desktop.ancestorInputMap",
//"Desktop.ancestorInputMap",
// new UIDefaults.LazyInputMap(new Object[] {
// "ctrl F5", "restore",
// "ctrl F4", "close",
Expand Down