git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...
[jalview.git]
/
src
/
jalview
/
jbgui
/
GSplitFrame.java
diff --git
a/src/jalview/jbgui/GSplitFrame.java
b/src/jalview/jbgui/GSplitFrame.java
index
7c4dcf3
..
ed715c8
100644
(file)
--- a/
src/jalview/jbgui/GSplitFrame.java
+++ b/
src/jalview/jbgui/GSplitFrame.java
@@
-20,6
+20,7
@@
*/
package jalview.jbgui;
*/
package jalview.jbgui;
+import jalview.bin.Jalview;
import jalview.util.Platform;
import java.awt.Component;
import jalview.util.Platform;
import java.awt.Component;
@@
-57,6
+58,7
@@
public class GSplitFrame extends JInternalFrame
*/
public GSplitFrame(GAlignFrame top, GAlignFrame bottom)
{
*/
public GSplitFrame(GAlignFrame top, GAlignFrame bottom)
{
+ setName(Jalview.getAppID("splitframe"));
this.topFrame = top;
this.bottomFrame = bottom;
this.topFrame = top;
this.bottomFrame = bottom;
@@
-102,7
+104,7
@@
public class GSplitFrame extends JInternalFrame
*/
protected void hideTitleBars()
{
*/
protected void hideTitleBars()
{
- if (new Platform().isAMac())
+ if (Platform.isAMacAndNotJS())
{
// this saves some space - but doesn't hide the title bar
topFrame.putClientProperty("JInternalFrame.isPalette", true);
{
// this saves some space - but doesn't hide the title bar
topFrame.putClientProperty("JInternalFrame.isPalette", true);
@@
-111,8
+113,8
@@
public class GSplitFrame extends JInternalFrame
}
else
{
}
else
{
- ((BasicInternalFrameUI) topFrame.getUI()).setNorthPane(null);
- ((BasicInternalFrameUI) bottomFrame.getUI()).setNorthPane(null);
+ ((BasicInternalFrameUI) topFrame.getUI()).setNorthPane(null);
+ ((BasicInternalFrameUI) bottomFrame.getUI()).setNorthPane(null);
}
}
}
}
@@
-153,7
+155,8
@@
public class GSplitFrame extends JInternalFrame
return false;
}
Point p = comp.getLocationOnScreen();
return false;
}
Point p = comp.getLocationOnScreen();
- Rectangle r = new Rectangle(p.x, p.y, comp.getWidth(), comp.getHeight());
+ Rectangle r = new Rectangle(p.x, p.y, comp.getWidth(),
+ comp.getHeight());
return r.contains(loc);
}
return r.contains(loc);
}
@@
-173,8
+176,8
@@
public class GSplitFrame extends JInternalFrame
else
{
this.dividerRatio = splitPane.getDividerLocation()
else
{
this.dividerRatio = splitPane.getDividerLocation()
- / (double) (splitPane.getHeight() - splitPane
- .getDividerSize());
+ / (double) (splitPane.getHeight()
+ - splitPane.getDividerSize());
}
if (alignFrame == this.topFrame)
}
if (alignFrame == this.topFrame)