Author: kono
Date: 2010-07-10 06:25:53 -0700 (Sat, 10 Jul 2010)
New Revision: 20889
Modified:
cytoscape/trunk/src/cytoscape/view/InternalFrameComponent.java
cytoscape/trunk/src/cytoscape/view/NetworkViewManager.java
Log:
Internal Frame resize problem on Mac (missing resize handle) is finally fixed.
Modified: cytoscape/trunk/src/cytoscape/view/InternalFrameComponent.java
===================================================================
--- cytoscape/trunk/src/cytoscape/view/InternalFrameComponent.java
2010-07-10 08:07:37 UTC (rev 20888)
+++ cytoscape/trunk/src/cytoscape/view/InternalFrameComponent.java
2010-07-10 13:25:53 UTC (rev 20889)
@@ -74,13 +74,13 @@
FOREGROUND_PANE;
int layer() {
if (this == BACKGROUND_PANE)
- return -30000;
+ return 10;
if (this == NETWORK_PANE)
- return 0;
+ return 20;
if (this == FOREGROUND_PANE)
- return 301;
+ return 30;
return 0;
}
@@ -194,9 +194,6 @@
* top - bottom: foreground, network, background
*/
private void initLayeredPane() {
- // remove all canvases from layered pane
- layeredPane.removeAll();
-
// foreground followed by network followed by background
layeredPane.add(backgroundCanvas, new
Integer(ZOrder.BACKGROUND_PANE.layer()));
layeredPane.add(networkCanvas, new
Integer(ZOrder.NETWORK_PANE.layer()));
Modified: cytoscape/trunk/src/cytoscape/view/NetworkViewManager.java
===================================================================
--- cytoscape/trunk/src/cytoscape/view/NetworkViewManager.java 2010-07-10
08:07:37 UTC (rev 20888)
+++ cytoscape/trunk/src/cytoscape/view/NetworkViewManager.java 2010-07-10
13:25:53 UTC (rev 20889)
@@ -44,6 +44,7 @@
import ding.view.DGraphView;
import ding.view.InnerCanvas;
+import java.awt.Color;
import java.awt.event.WindowEvent;
import java.awt.event.WindowFocusListener;
@@ -59,6 +60,9 @@
import javax.swing.JDesktopPane;
import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JLayeredPane;
+import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -401,10 +405,10 @@
// code added to support layered canvas for each CyNetworkView
if (view instanceof DGraphView) {
- InternalFrameComponent internalFrameComp = new
InternalFrameComponent(iframe
-
.getLayeredPane(),
-
(DGraphView) view);
- iframe.setContentPane(internalFrameComp);
+ final InternalFrameComponent internalFrameComp =
+ new
InternalFrameComponent(iframe.getLayeredPane(), (DGraphView) view);
+
+ iframe.getContentPane().add(internalFrameComp);
internalFrameComponentMap.put(view.getNetwork().getIdentifier(),
internalFrameComp);
} else {
logger.info("NetworkViewManager.createContainer() -
DGraphView not found!");
@@ -413,12 +417,7 @@
iframe.pack();
- //iframe.setSize(400, 400);
- // create cascade iframe
int x = 0;
-
- //iframe.setSize(400, 400);
- // create cascade iframe
int y = 0;
JInternalFrame refFrame = null;
JInternalFrame[] allFrames = desktopPane.getAllFrames();
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
