Author: kono
Date: 2011-09-27 13:47:40 -0700 (Tue, 27 Sep 2011)
New Revision: 26990
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewMouseListener.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
Log:
fixes #381 Background color is set correctly.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewMouseListener.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewMouseListener.java
2011-09-27 20:17:33 UTC (rev 26989)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewMouseListener.java
2011-09-27 20:47:40 UTC (rev 26990)
@@ -41,6 +41,7 @@
import javax.swing.SwingUtilities;
+import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.view.vizmap.gui.DefaultViewEditor;
import org.cytoscape.view.vizmap.gui.DefaultViewPanel;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
@@ -86,8 +87,9 @@
.getCurrentVisualStyle(),
((DefaultViewPanel) defViewEditor
.getDefaultView(manager.getCurrentVisualStyle()))
.getRenderingEngine(), new
Dimension(newWidth, newHeight));
+ final VisualStyle style =
manager.getCurrentVisualStyle();
vizMapperMainPanel.setDefaultViewImagePanel(vizMapperMainPanel
-
.getDefaultImageManager().get(manager.getCurrentVisualStyle()));
+ .getDefaultImageManager().get(style),
style);
}
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2011-09-27 20:17:33 UTC (rev 26989)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2011-09-27 20:47:40 UTC (rev 26990)
@@ -261,7 +261,7 @@
}
// Set the default view to the panel.
- setDefaultViewImagePanel(defImg);
+ setDefaultViewImagePanel(defImg, style);
propertySheetPanel.setSorting(true);
}
@@ -340,7 +340,7 @@
*
* @param defImage
*/
- public void setDefaultViewImagePanel(final Image defImage) {
+ void setDefaultViewImagePanel(final Image defImage, final VisualStyle
newStyle) {
if (defImage == null) {
logger.debug("Default image is null!");
return;
@@ -353,8 +353,7 @@
defaultImageButton.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
defaultImageButton.setIcon(new ImageIcon(defImage));
- final VisualStyle currentStyle =
manager.getCurrentVisualStyle();
- defaultImageButton.setBackground((Color) currentStyle
+ defaultImageButton.setBackground((Color) newStyle
.getDefaultValue(MinimalVisualLexicon.NETWORK_BACKGROUND_PAINT));
defaultViewImagePanel.add(defaultImageButton,
BorderLayout.CENTER);
--
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.
