git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6425c7e)
menu update; popup not functioning, though?? Working fine in test suite.
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Mon, 21 Jan 2019 04:52:03 +0000 (22:52 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Mon, 21 Jan 2019 04:52:03 +0000 (22:52 -0600)
Will test.

src/jalview/gui/Desktop.java patch | blob | history
swingjs/SwingJS-site.zip patch | blob | history
swingjs/timestamp patch | blob | history
swingjs/ver/3.2.4/SwingJS-site.zip patch | blob | history
swingjs/ver/3.2.4/timestamp patch | blob | history
template.html patch | blob | history

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 6599cb9..1e373c3 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -374,12 +374,9 @@ public class Desktop extends jalview.jbgui.GDesktop
     // getContentPane().add(sp, BorderLayout.CENTER);
     
     // BH 2018 - just an experiment to try unclipped JInternalFrames. 
-    // Must set for all three to be active:
        if (Jalview.isJS()) 
        {
          getRootPane().putClientProperty("swingjs.overflow.hidden", "false");
-         ((JComponent) getContentPane()).putClientProperty("swingjs.overflow.hidden", "false");
-         desktop.putClientProperty("swingjs.overflow.hidden", "false");
        }
     
     getContentPane().add(desktop, BorderLayout.CENTER);
diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index ed59d53..0960bad 100644 (file)
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index dd7be95..8d011e6 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1 @@
-20190119065335 
+20190120224615 
diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index ed59d53..0960bad 100644 (file)
Binary files a/swingjs/ver/3.2.4/SwingJS-site.zip and b/swingjs/ver/3.2.4/SwingJS-site.zip differ
diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index dd7be95..8d011e6 100644 (file)
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190119065335 
+20190120224615 
diff --git a/template.html b/template.html
index 2a22a77..e959685 100644 (file)
--- a/template.html
+++ b/template.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>SwingJS test _NAME_</title><meta charset="utf-8" />
+<title>SwingJS test _NAME_</title>
+<meta charset="utf-8" />
 <script src="swingjs/swingjs2.js"></script>
 <script>
 if (!self.SwingJS)alert('swingjs2.js was not found. It needs to be in swingjs folder in the same directory as ' + document.location.href)