diff options
| author | Roman Kennke <roman@kennke.org> | 2006-07-17 08:36:47 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2006-07-17 08:36:47 +0000 |
| commit | b9fd0e3b9969b7de9a02f0f0b60dbbf71a376aed (patch) | |
| tree | a8fb75e3d18ec24b607844f8e41fed8973311aa9 | |
| parent | 0a134b2092fe922c7a81e6944bbe08b298d4aa9b (diff) | |
| download | classpath-b9fd0e3b9969b7de9a02f0f0b60dbbf71a376aed.tar.gz | |
2006-07-17 Roman Kennke <kennke@aicas.com>
* javax/swing/plaf/basic/BasicButtonListener.java
(propertyChange): Only do the text layout caching as long
as the noGraphics2D property isn't set.
* javax/swing/plaf/basic/BasicMenuItemUI.java
(PropertyChangeHandler.propertyChange): Only do the text layout
caching as long as the noGraphics2D property isn't set.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | javax/swing/plaf/basic/BasicButtonListener.java | 8 | ||||
| -rw-r--r-- | javax/swing/plaf/basic/BasicMenuItemUI.java | 9 |
3 files changed, 22 insertions, 4 deletions
@@ -1,5 +1,14 @@ 2006-07-17 Roman Kennke <kennke@aicas.com> + * javax/swing/plaf/basic/BasicButtonListener.java + (propertyChange): Only do the text layout caching as long + as the noGraphics2D property isn't set. + * javax/swing/plaf/basic/BasicMenuItemUI.java + (PropertyChangeHandler.propertyChange): Only do the text layout + caching as long as the noGraphics2D property isn't set. + +2006-07-17 Roman Kennke <kennke@aicas.com> + * gnu/java/awt/peer/x/XGraphicsEnvironment.java (XGraphicsEnvironment): Make constructor public so that it can be called via Class.forName().newInstance(). diff --git a/javax/swing/plaf/basic/BasicButtonListener.java b/javax/swing/plaf/basic/BasicButtonListener.java index fe0365a50..3b4759ae4 100644 --- a/javax/swing/plaf/basic/BasicButtonListener.java +++ b/javax/swing/plaf/basic/BasicButtonListener.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing.plaf.basic; +import gnu.classpath.SystemProperties; + import java.awt.event.ActionEvent; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; @@ -71,8 +73,10 @@ public class BasicButtonListener implements MouseListener, MouseMotionListener, // Store the TextLayout for this in a client property for speed-up // painting of the label. String property = e.getPropertyName(); - if (property.equals(AbstractButton.TEXT_CHANGED_PROPERTY) - || property.equals("font")) + if ((property.equals(AbstractButton.TEXT_CHANGED_PROPERTY) + || property.equals("font")) + && SystemProperties.getProperty("gnu.javax.swing.noGraphics2D") + == null) { AbstractButton b = (AbstractButton) e.getSource(); String text = b.getText(); diff --git a/javax/swing/plaf/basic/BasicMenuItemUI.java b/javax/swing/plaf/basic/BasicMenuItemUI.java index c5ed2ff7e..bbc08535c 100644 --- a/javax/swing/plaf/basic/BasicMenuItemUI.java +++ b/javax/swing/plaf/basic/BasicMenuItemUI.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing.plaf.basic; +import gnu.classpath.SystemProperties; + import java.awt.Color; import java.awt.Component; import java.awt.Container; @@ -256,8 +258,11 @@ public class BasicMenuItemUI extends MenuItemUI map.put(accelerator, "doClick"); } // TextLayout caching for speed-up drawing of text. - else if (property.equals(AbstractButton.TEXT_CHANGED_PROPERTY) - || property.equals("font")) + else if ((property.equals(AbstractButton.TEXT_CHANGED_PROPERTY) + || property.equals("font")) + && SystemProperties.getProperty("gnu.javax.swing.noGraphics2D") + == null) + { AbstractButton b = (AbstractButton) e.getSource(); String text = b.getText(); |