Author: kono
Date: 2011-07-01 15:53:02 -0700 (Fri, 01 Jul 2011)
New Revision: 26003
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InternalFrameComponent.java
Log:
fixes #309 JInternalFrame resize handle is enabled for Mac.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2011-07-01 21:41:05 UTC (rev 26002)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/DingRenderingEngineFactory.java
2011-07-01 22:53:02 UTC (rev 26003)
@@ -125,12 +125,15 @@
if (presentationContainer instanceof JInternalFrame) {
final JInternalFrame inFrame = (JInternalFrame)
presentationContainer;
- //JDesktopPane desktopPane =
inFrame.getDesktopPane();
+
+ final InternalFrameComponent internalFrameComp
=
+ new
InternalFrameComponent(inFrame.getLayeredPane(), dgv);
+ inFrame.getContentPane().add(internalFrameComp);
- // TODO - not sure this layered pane bit is
optimal
- inFrame.setContentPane(dgv.getContainer(inFrame
- .getLayeredPane()));
- // dgv.addTransferComponent(desktopPane);
+// // TODO - not sure this layered pane bit is
optimal
+// inFrame.setContentPane(dgv.getContainer(inFrame
+// .getLayeredPane()));
+// // dgv.addTransferComponent(desktopPane);
} else {
final JComponent component = (JComponent)
presentationContainer;
component.setLayout(new BorderLayout());
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InternalFrameComponent.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InternalFrameComponent.java
2011-07-01 21:41:05 UTC (rev 26002)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/InternalFrameComponent.java
2011-07-01 22:53:02 UTC (rev 26003)
@@ -39,13 +39,16 @@
// imports
-import javax.swing.*;
-import java.awt.*;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
import java.awt.print.PageFormat;
import java.awt.print.Printable;
import java.awt.print.PrinterException;
+import javax.swing.JComponent;
+import javax.swing.JLayeredPane;
+
/**
* This class manages the JLayeredPane that resides in
* each internal frame of cytoscape. Its intended to be the
@@ -54,8 +57,13 @@
*/
public class InternalFrameComponent extends JComponent implements Printable {
private final static long serialVersionUID = 1213747102972998L;
+
/**
* z-order enumeration
+ *
+ * TODO: this breaks resize-handle on Mac OS X.
+ * Need to do some research on this layring order.
+ *
*/
private static enum ZOrder {
BACKGROUND_PANE,
@@ -63,13 +71,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;
}
@@ -183,9 +191,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,
Integer.valueOf(ZOrder.BACKGROUND_PANE.layer()));
layeredPane.add(networkCanvas,
Integer.valueOf(ZOrder.NETWORK_PANE.layer()));
--
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.
