Author: scooter
Date: 2011-08-04 14:23:03 -0700 (Thu, 04 Aug 2011)
New Revision: 26380
Modified:
cytoscape/trunk/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/BasicCytoShapeEntity.java
cytoscape/trunk/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/ShapePalette.java
Log:
A little more tweaking -- this time fix the size of the shape palletes
themselves.
Modified:
cytoscape/trunk/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/BasicCytoShapeEntity.java
===================================================================
---
cytoscape/trunk/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/BasicCytoShapeEntity.java
2011-08-04 21:00:00 UTC (rev 26379)
+++
cytoscape/trunk/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/BasicCytoShapeEntity.java
2011-08-04 21:23:03 UTC (rev 26380)
@@ -270,6 +270,7 @@
// MLC 12/04/06 BEGIN:
// force height to be at least
// CytoscapeShapeIcon.DEFAULT_HEIGHT but larger if needed:
+ /*
Dimension mySize = new Dimension(((JPanel)
Cytoscape.getDesktop()
.getCytoPanel(SwingConstants.WEST))
.getSize().width
@@ -277,9 +278,16 @@
Math.max(_image.getIconHeight(),
CytoShapeIcon.DEFAULT_HEIGHT)
+
CytoShapeIcon.DEFAULT_HEIGHT);
+ */
+ Dimension mySize = new Dimension(32767,
+
Math.max(_image.getIconHeight(), CytoShapeIcon.DEFAULT_HEIGHT)
+
+(int)((double)CytoShapeIcon.DEFAULT_HEIGHT/.75));
this.setMaximumSize(mySize);
- this.setMinimumSize(mySize);
+
+ mySize = new Dimension(300,
+ Math.max(_image.getIconHeight(),
CytoShapeIcon.DEFAULT_HEIGHT)
+
+(int)((double)CytoShapeIcon.DEFAULT_HEIGHT/.75));
this.setPreferredSize(mySize);
Modified:
cytoscape/trunk/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/ShapePalette.java
===================================================================
---
cytoscape/trunk/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/ShapePalette.java
2011-08-04 21:00:00 UTC (rev 26379)
+++
cytoscape/trunk/coreplugins/CytoscapeEditor2/src/main/java/cytoscape/editor/impl/ShapePalette.java
2011-08-04 21:23:03 UTC (rev 26380)
@@ -128,7 +128,7 @@
JEditorPane instructionsArea = new
JEditorPane("text/html",instructions);
// 32767 ????
- instructionsArea.setPreferredSize(new java.awt.Dimension(300,
400));
+ instructionsArea.setPreferredSize(new java.awt.Dimension(300,
300));
instructionsArea.setBackground(Cytoscape.getDesktop().getBackground());
_controlPane.add(instructionsArea);
_controlPane.setBackground(Cytoscape.getDesktop().getBackground());
--
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.
