From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 26 Nov 2018 10:44:56 +0000 (+0000)
Subject: JAL-3032 make JS properties conditional on Jalview.isJS()
X-Git-Tag: Release_2_11_4_0~45^2~18^2~366^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8a5e515191927f18f4d06b261888c011798ff506;p=jalview.git

JAL-3032 make JS properties conditional on Jalview.isJS()
---

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 12359d0..701d778 100644
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -376,9 +376,12 @@ public class Desktop extends jalview.jbgui.GDesktop
     
     // BH 2018 - just an experiment to try unclipped JInternalFrames. 
     // Must set for all three to be active:
-    getRootPane().putClientProperty("swingjs.overflow.hidden", "false");
-    ((JComponent)getContentPane()).putClientProperty("swingjs.overflow.hidden", "false");
-    desktop.putClientProperty("swingjs.overflow.hidden", "false");
+	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);
     desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);