MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

invalidate only buttons with text

Browse Source
This commit is contained in:
Gregory.Shrago
2016-05-20 17:08:23 +03:00
parent f3ff300704
commit b32e6aa73d
2 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
+27 -34
View File
@@ -30,7 +30,6 @@ import com.intellij.util.ui.JBDimension;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.accessibility.ScreenReader;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -48,7 +47,7 @@ public class ActionButton extends JComponent implements ActionButtonComponent, A
private static final Icon ourEmptyIcon = EmptyIcon.ICON_18;
private JBDimension myMinimumButtonSize;
private PropertyChangeListener myActionButtonSynchronizer;
private PropertyChangeListener myPresentationListener;
private Icon myDisabledIcon;
private Icon myIcon;
protected final Presentation myPresentation;
@@ -193,18 +192,17 @@ public class ActionButton extends JComponent implements ActionButtonComponent, A
}
public void removeNotify() {
if (myActionButtonSynchronizer != null) {
myPresentation.removePropertyChangeListener(myActionButtonSynchronizer);
myActionButtonSynchronizer = null;
if (myPresentationListener != null) {
myPresentation.removePropertyChangeListener(myPresentationListener);
myPresentationListener = null;
}
super.removeNotify();
}
public void addNotify() {
super.addNotify();
if (myActionButtonSynchronizer == null) {
myActionButtonSynchronizer = new ActionButtonSynchronizer();
myPresentation.addPropertyChangeListener(myActionButtonSynchronizer);
if (myPresentationListener == null) {
myPresentation.addPropertyChangeListener(myPresentationListener = this::presentationPropertyChanded);
}
AnActionEvent e = new AnActionEvent(null, getDataContext(), myPlace, myPresentation, ActionManager.getInstance(), 0);
ActionUtil.performDumbAwareUpdate(myAction, e, false);
@@ -366,32 +364,27 @@ public class ActionButton extends JComponent implements ActionButtonComponent, A
return myAction;
}
private class ActionButtonSynchronizer implements PropertyChangeListener {
@NonNls protected static final String SELECTED_PROPERTY_NAME = "selected";
public void propertyChange(PropertyChangeEvent e) {
String propertyName = e.getPropertyName();
if (Presentation.PROP_TEXT.equals(propertyName)) {
updateToolTipText();
revalidate(); // recalc preferred size & repaint instantly
}
else if (Presentation.PROP_ENABLED.equals(propertyName)) {
updateIcon();
repaint();
}
else if (Presentation.PROP_ICON.equals(propertyName)) {
updateIcon();
repaint();
}
else if (Presentation.PROP_DISABLED_ICON.equals(propertyName)) {
setDisabledIcon(myPresentation.getDisabledIcon());
repaint();
}
else if (Presentation.PROP_VISIBLE.equals(propertyName)) {
}
else if (SELECTED_PROPERTY_NAME.equals(propertyName)) {
repaint();
}
protected void presentationPropertyChanded(PropertyChangeEvent e) {
String propertyName = e.getPropertyName();
if (Presentation.PROP_TEXT.equals(propertyName)) {
updateToolTipText();
}
else if (Presentation.PROP_ENABLED.equals(propertyName)) {
updateIcon();
repaint();
}
else if (Presentation.PROP_ICON.equals(propertyName)) {
updateIcon();
repaint();
}
else if (Presentation.PROP_DISABLED_ICON.equals(propertyName)) {
setDisabledIcon(myPresentation.getDisabledIcon());
repaint();
}
else if (Presentation.PROP_VISIBLE.equals(propertyName)) {
}
else if ("selected".equals(propertyName)) {
repaint();
}
}
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java
+8
View File
@@ -146,6 +146,14 @@ public class ActionButtonWithText extends ActionButton {
textRect.y + fm.getAscent());
}
@Override
protected void presentationPropertyChanded(PropertyChangeEvent e) {
super.presentationPropertyChanded(e);
if (Presentation.PROP_TEXT.equals(e.getPropertyName())) {
revalidate(); // recalc preferred size & repaint instantly
}
}
public Color getInactiveTextColor() {
return UIUtil.getInactiveTextColor();
}