Author: apico
Date: 2011-06-24 11:58:29 -0700 (Fri, 24 Jun 2011)
New Revision: 25922
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/view/cytopanels/CytoPanelImp.java
Log:
SOUTH was fine. the problem was EAST minHeight. now fixed and all panels play
nice together.
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/view/cytopanels/CytoPanelImp.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/view/cytopanels/CytoPanelImp.java
2011-06-24 18:53:07 UTC (rev 25921)
+++
cytoscape/trunk/application/src/main/java/cytoscape/view/cytopanels/CytoPanelImp.java
2011-06-24 18:58:29 UTC (rev 25922)
@@ -103,7 +103,7 @@
private static final int SOUTH_MIN_WIDTH = 500;
private static final int SOUTH_MIN_HEIGHT = 50;
private static final int EAST_MIN_WIDTH = 100;
- private static final int EAST_MIN_HEIGHT = 500;
+ private static final int EAST_MIN_HEIGHT = 100;
/**
* The JTabbedPane we hide.
@@ -285,6 +285,10 @@
component.setMinimumSize(new Dimension(
WEST_MIN_WIDTH,
WEST_MIN_HEIGHT));
+ else if (compassDirection == SwingConstants.SOUTH)
+ component.setMinimumSize(new Dimension(
+ SOUTH_MIN_WIDTH,
+ SOUTH_MIN_HEIGHT));
else if (compassDirection == SwingConstants.EAST)
component.setMinimumSize(new Dimension(
EAST_MIN_WIDTH,
@@ -313,6 +317,10 @@
component.setMinimumSize(new Dimension(
WEST_MIN_WIDTH,
WEST_MIN_HEIGHT));
+ else if (compassDirection == SwingConstants.SOUTH)
+ component.setMinimumSize(new Dimension(
+ SOUTH_MIN_WIDTH,
+ SOUTH_MIN_HEIGHT));
else if (compassDirection == SwingConstants.EAST)
component.setMinimumSize(new Dimension(
EAST_MIN_WIDTH,
@@ -341,6 +349,10 @@
component.setMinimumSize(new Dimension(
WEST_MIN_WIDTH,
WEST_MIN_HEIGHT));
+ else if (compassDirection == SwingConstants.SOUTH)
+ component.setMinimumSize(new Dimension(
+ SOUTH_MIN_WIDTH,
+ SOUTH_MIN_HEIGHT));
else if (compassDirection == SwingConstants.EAST)
component.setMinimumSize(new Dimension(
EAST_MIN_WIDTH,
@@ -369,6 +381,10 @@
component.setMinimumSize(new Dimension(
WEST_MIN_WIDTH,
WEST_MIN_HEIGHT));
+ else if (compassDirection == SwingConstants.SOUTH)
+ component.setMinimumSize(new Dimension(
+ SOUTH_MIN_WIDTH,
+ SOUTH_MIN_HEIGHT));
else if (compassDirection == SwingConstants.EAST)
component.setMinimumSize(new Dimension(
EAST_MIN_WIDTH,
@@ -395,6 +411,10 @@
component.setMinimumSize(new Dimension(
WEST_MIN_WIDTH,
WEST_MIN_HEIGHT));
+ else if (compassDirection == SwingConstants.SOUTH)
+ component.setMinimumSize(new Dimension(
+ SOUTH_MIN_WIDTH,
+ SOUTH_MIN_HEIGHT));
else if (compassDirection == SwingConstants.EAST)
component.setMinimumSize(new Dimension(
EAST_MIN_WIDTH,
@@ -422,6 +442,10 @@
component.setMinimumSize(new Dimension(
WEST_MIN_WIDTH,
WEST_MIN_HEIGHT));
+ else if (compassDirection == SwingConstants.SOUTH)
+ component.setMinimumSize(new Dimension(
+ SOUTH_MIN_WIDTH,
+ SOUTH_MIN_HEIGHT));
else if (compassDirection == SwingConstants.EAST)
component.setMinimumSize(new Dimension(
EAST_MIN_WIDTH,
@@ -960,11 +984,8 @@
* selected panel's preferredSize
setting
*
*/
- if (compassDirection ==
SwingConstants.WEST
- || compassDirection ==
SwingConstants.EAST){
- Component panel =
tabbedPane.getSelectedComponent();
-
setMinimumSize(panel.getPreferredSize());
- }
+ Component panel =
tabbedPane.getSelectedComponent();
+
setMinimumSize(panel.getPreferredSize());
int selectedIndex =
tabbedPane.getSelectedIndex();
cytoPanelListener.onComponentSelected(selectedIndex);
--
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.
