Menu
▾
▴
[JavaAmp-CVS] javaamp/src Docker.java,1.3,1.4 EqualizerDialog.java,1.20,1.21 PlayDialog.java,1.19,1.20 PlaylistDialog.java,1.27,1.28
|
From: WiESi <wi...@us...> - 2006-04-11 07:01:21
|
Update of /cvsroot/javaamp/javaamp/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23907/src Modified Files: Docker.java EqualizerDialog.java PlayDialog.java PlaylistDialog.java Log Message: Improved window docking code Index: Docker.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/Docker.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Docker.java 25 Feb 2006 16:49:58 -0000 1.3 +++ Docker.java 11 Apr 2006 07:01:11 -0000 1.4 @@ -2,8 +2,10 @@ public class Docker { - public final static void dockScreen(int dd, Point o, Rectangle t, - Insets si) { + public final static void dockScreen(Point o, Rectangle t, + GraphicsConfiguration gc) { + int dd = Settings.dockingd; + Insets si = Toolkit.getDefaultToolkit().getScreenInsets(gc); Dimension sd = Toolkit.getDefaultToolkit().getScreenSize(); Rectangle s = new Rectangle(si.left, si.top, sd.width - si.left - si.right, sd.height - si.top - si.bottom); @@ -17,8 +19,8 @@ o.y = s.y + s.height - t.height; } - public final static boolean dock(int dd, Point o, Rectangle t, - Rectangle r) { + public final static boolean dock(Point o, Rectangle t, Rectangle r) { + int dd = Settings.dockingd; boolean docked = false; if(t.x + t.width >= r.x - dd && t.x <= r.x + r.width + dd) if(Math.abs(t.y + t.height - r.y) <= dd) { @@ -50,8 +52,8 @@ return docked; } - public final static boolean isDocked(int dd, Point o, Rectangle t, - Rectangle r) { + public final static boolean isDocked(Point o, Rectangle t, Rectangle r) { + int dd = Settings.dockingd; if(t.x + t.width >= r.x - dd && t.x <= r.x + r.width + dd) if(Math.abs(t.y + t.height - r.y) <= dd) return true; Index: PlayDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlayDialog.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- PlayDialog.java 11 Apr 2006 06:49:26 -0000 1.19 +++ PlayDialog.java 11 Apr 2006 07:01:11 -0000 1.20 @@ -549,26 +549,23 @@ oh3 = owner.equalizerDialog.getLocation().y - oh; } Point p = new Point(ow, oh); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, - getWidth(), getHeight()), getToolkit().getScreenInsets( - getGraphicsConfiguration())); + Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()), + getGraphicsConfiguration()); if(!dockedPlaylist2 && owner.playlistDialog.isVisible()) - dockedPlaylist = Docker.dock(Settings.dockingd, p, new Rectangle(ow, - oh, getWidth(), getHeight()), owner.playlistDialog.getBounds()); + dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, getWidth(), + getHeight()), owner.playlistDialog.getBounds()); if(!dockedEqualizer2 && owner.equalizerDialog.isVisible()) - dockedEqualizer = Docker.dock(Settings.dockingd, p, new Rectangle( - ow, oh, getWidth(), getHeight()), - owner.equalizerDialog.getBounds()); + dockedEqualizer = Docker.dock(p, new Rectangle(ow, oh, getWidth(), + getHeight()), owner.equalizerDialog.getBounds()); ow = p.x; oh = p.y; if((dockedPlaylist2 || (dockedEqualizer2 && owner.equalizerDialog.dockedPlaylist2)) && owner.playlistDialog.isVisible()) { p = new Point(ow + ow2, oh + oh2); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow2, oh + - oh2, owner.playlistDialog.getWidth(), - owner.playlistDialog.getHeight()), getToolkit().getScreenInsets( - getGraphicsConfiguration())); + Docker.dockScreen(p, new Rectangle(ow + ow2, oh + oh2, + owner.playlistDialog.getWidth(), + owner.playlistDialog.getHeight()), getGraphicsConfiguration()); ow = p.x - ow2; oh = p.y - oh2; } @@ -576,10 +573,9 @@ owner.equalizerDialog.dockedPlaylist2)) && owner.equalizerDialog.isVisible()) { p = new Point(ow + ow3, oh + oh3); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow + ow3, oh + - oh3, owner.equalizerDialog.getWidth(), - owner.equalizerDialog.getHeight()), - getToolkit().getScreenInsets(getGraphicsConfiguration())); + Docker.dockScreen(p, new Rectangle(ow + ow3, oh + oh3, + owner.equalizerDialog.getWidth(), + owner.equalizerDialog.getHeight()), getGraphicsConfiguration()); ow = p.x - ow3; oh = p.y - oh3; } @@ -589,8 +585,8 @@ if(!owner.equalizerDialog.dockedPlaylist2 && owner.playlistDialog.isVisible() && owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = Docker.dock( - Settings.dockingd, p, new Rectangle(ow + ow2, oh + oh2, + owner.equalizerDialog.dockedPlaylist = Docker.dock(p, + new Rectangle(ow + ow2, oh + oh2, owner.playlistDialog.getWidth(), owner.playlistDialog.getHeight()), owner.equalizerDialog.getBounds()); @@ -605,8 +601,8 @@ if(!owner.equalizerDialog.dockedPlaylist2 && owner.playlistDialog.isVisible() && owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = Docker.dock( - Settings.dockingd, p, new Rectangle(ow + ow3, oh + oh3, + owner.equalizerDialog.dockedPlaylist = Docker.dock(p, + new Rectangle(ow + ow3, oh + oh3, owner.equalizerDialog.getWidth(), owner.equalizerDialog.getHeight()), owner.playlistDialog.getBounds()); Index: PlaylistDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/PlaylistDialog.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- PlaylistDialog.java 11 Apr 2006 06:49:26 -0000 1.27 +++ PlaylistDialog.java 11 Apr 2006 07:01:11 -0000 1.28 @@ -538,25 +538,23 @@ oh = getLocation().y; } Point p = new Point(ow, oh); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, - getWidth(), getHeight()), getToolkit().getScreenInsets( - getGraphicsConfiguration())); - owner.playDialog.dockedPlaylist = Docker.dock(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.playDialog.getBounds()); + Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()), + getGraphicsConfiguration()); + owner.playDialog.dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, + getWidth(), getHeight()), owner.playDialog.getBounds()); ow = p.x; oh = p.y; if(owner.equalizerDialog.isVisible()) { - owner.equalizerDialog.dockedPlaylist = Docker.dock( - Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), - getHeight()), owner.equalizerDialog.getBounds()); + owner.equalizerDialog.dockedPlaylist = Docker.dock(p, + new Rectangle(ow, oh, getWidth(), getHeight()), + owner.equalizerDialog.getBounds()); ow = p.x; oh = p.y; } else - owner.equalizerDialog.dockedPlaylist = Docker.isDocked( - Settings.dockingd, p, new Rectangle(ow, oh, getWidth(), - getHeight()), owner.equalizerDialog.getBounds()); + owner.equalizerDialog.dockedPlaylist = Docker.isDocked(p, + new Rectangle(ow, oh, getWidth(), getHeight()), + owner.equalizerDialog.getBounds()); setLocation(ow, oh); } Index: EqualizerDialog.java =================================================================== RCS file: /cvsroot/javaamp/javaamp/src/EqualizerDialog.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- EqualizerDialog.java 11 Apr 2006 06:49:26 -0000 1.20 +++ EqualizerDialog.java 11 Apr 2006 07:01:11 -0000 1.21 @@ -196,26 +196,23 @@ oh = getLocation().y; } Point p = new Point(ow, oh); - Docker.dockScreen(Settings.dockingd, p, new Rectangle(ow, oh, - getWidth(), getHeight()), getToolkit().getScreenInsets( - getGraphicsConfiguration())); + Docker.dockScreen(p, new Rectangle(ow, oh, getWidth(), getHeight()), + getGraphicsConfiguration()); ow = p.x; oh = p.y; - owner.playDialog.dockedEqualizer = Docker.dock(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.playDialog.getBounds()); + owner.playDialog.dockedEqualizer = Docker.dock(p, new Rectangle(ow, oh, + getWidth(), getHeight()), owner.playDialog.getBounds()); ow = p.x; oh = p.y; if(owner.playlistDialog.isVisible()) { - dockedPlaylist = Docker.dock(Settings.dockingd, p, new Rectangle(ow, - oh, getWidth(), getHeight()), owner.playlistDialog.getBounds()); + dockedPlaylist = Docker.dock(p, new Rectangle(ow, oh, getWidth(), + getHeight()), owner.playlistDialog.getBounds()); ow = p.x; oh = p.y; } else - dockedPlaylist = Docker.isDocked(Settings.dockingd, p, - new Rectangle(ow, oh, getWidth(), getHeight()), - owner.playlistDialog.getBounds()); + dockedPlaylist = Docker.isDocked(p, new Rectangle(ow, oh, + getWidth(), getHeight()), owner.playlistDialog.getBounds()); setLocation(ow, oh); } |
