From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Mon, 21 Nov 2011 18:58:09 +0000 (+0000)
Subject: Merge branch 'JAL-368_dragabovedesktop' into develop
X-Git-Tag: Jalview_2_9~552
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0233d3cada9302f2e78d4444de98886431bf4357;hp=c9bcd60e5ed0681116e9bedbd371f7a8b8290126;p=jalview.git

Merge branch 'JAL-368_dragabovedesktop' into develop
---

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 0ab111f..b8c224d 100644
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -204,6 +204,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements
 
     public void dragFrame(JComponent f, int newX, int newY)
     {
+      if (newY<0)
+      {
+        newY=0;
+      }
       delegate.dragFrame(f, newX, newY);
     }
 
@@ -240,6 +244,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     public void resizeFrame(JComponent f, int newX, int newY, int newWidth,
             int newHeight)
     {
+      Rectangle b=desktop.getBounds();
+      if (newY<0)
+      {
+        newY=0;
+      }
       delegate.resizeFrame(f, newX, newY, newWidth, newHeight);
     }
 
@@ -282,12 +291,14 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     //sp.getViewport().setView(desktop);
     //getContentPane().add(sp, BorderLayout.CENTER);
     getContentPane().add(desktop, BorderLayout.CENTER);
-      desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
+    desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
+    
       
     // This line prevents Windows Look&Feel resizing all new windows to maximum
     // if previous window was maximised
     desktop.setDesktopManager(new MyDesktopManager(
             new DefaultDesktopManager()));
+    
     Rectangle dims = getLastKnownDimensions("");
     if (dims != null)
     {