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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yann Cébron
2014-10-29 10:23:26 +01:00
parent debacd0517 2aa898e09d
commit 144862d625
1 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionMenuItem.java
+52 -52
View File
@@ -56,11 +56,11 @@ public class ActionMenuItem extends JCheckBoxMenuItem {
private final Presentation myPresentation;
private final String myPlace;
private final boolean myInsideCheckedGroup;
private final boolean myEnableMnemonics;
private final boolean myToggleable;
private DataContext myContext;
private AnActionEvent myEvent;
private MenuItemSynchronizer myMenuItemSynchronizer;
private final boolean myEnableMnemonics;
private final boolean myToggleable;
private boolean myToggled;
public ActionMenuItem(final AnAction action,
@@ -92,6 +92,10 @@ public class ActionMenuItem extends JCheckBoxMenuItem {
}
}
private static boolean isEnterKeyStroke(KeyStroke keyStroke) {
return keyStroke.getKeyCode() == KeyEvent.VK_ENTER && keyStroke.getModifiers() == 0;
}
public void prepare() {
init();
installSynchronizer();
@@ -170,10 +174,6 @@ public class ActionMenuItem extends JCheckBoxMenuItem {
}
}
private static boolean isEnterKeyStroke(KeyStroke keyStroke) {
return keyStroke.getKeyCode() == KeyEvent.VK_ENTER && keyStroke.getModifiers() == 0;
}
@Override
public void updateUI() {
if (UIUtil.isStandardMenuLAF()) {
@@ -208,6 +208,52 @@ public class ActionMenuItem extends JCheckBoxMenuItem {
myEvent = new AnActionEvent(null, context, myPlace, myPresentation, ActionManager.getInstance(), 0);
}
private void updateIcon(AnAction action) {
if (isToggleable() && (myPresentation.getIcon() == null || myInsideCheckedGroup || !UISettings.getInstance().SHOW_ICONS_IN_MENUS)) {
action.update(myEvent);
myToggled = Boolean.TRUE.equals(myEvent.getPresentation().getClientProperty(Toggleable.SELECTED_PROPERTY));
if (ActionPlaces.MAIN_MENU.equals(myPlace) && SystemInfo.isMacSystemMenu ||
UIUtil.isUnderNimbusLookAndFeel() ||
UIUtil.isUnderWindowsLookAndFeel() && SystemInfo.isWin7OrNewer) {
setState(myToggled);
}
else if (!(getUI() instanceof GtkMenuItemUI)) {
if (myToggled) {
setIcon(ourCheckedIcon);
setDisabledIcon(IconLoader.getDisabledIcon(ourCheckedIcon));
}
else {
setIcon(ourUncheckedIcon);
setDisabledIcon(IconLoader.getDisabledIcon(ourUncheckedIcon));
}
}
}
else {
if (UISettings.getInstance().SHOW_ICONS_IN_MENUS) {
Icon icon = myPresentation.getIcon();
if (action instanceof ToggleAction && ((ToggleAction)action).isSelected(myEvent)) {
icon = new PoppedIcon(icon, 16, 16);
}
setIcon(icon);
if (myPresentation.getDisabledIcon() != null) {
setDisabledIcon(myPresentation.getDisabledIcon());
}
else {
setDisabledIcon(IconLoader.getDisabledIcon(icon));
}
}
}
}
public boolean isToggleable() {
return myToggleable;
}
@Override
public boolean isSelected() {
return myToggled;
}
private final class ActionTransmitter implements ActionListener {
/**
* @param component component
@@ -274,52 +320,6 @@ public class ActionMenuItem extends JCheckBoxMenuItem {
}
}
private void updateIcon(AnAction action) {
if (isToggleable() && (myPresentation.getIcon() == null || myInsideCheckedGroup)) {
action.update(myEvent);
myToggled = Boolean.TRUE.equals(myEvent.getPresentation().getClientProperty(Toggleable.SELECTED_PROPERTY));
if (ActionPlaces.MAIN_MENU.equals(myPlace) && SystemInfo.isMacSystemMenu ||
UIUtil.isUnderNimbusLookAndFeel() ||
UIUtil.isUnderWindowsLookAndFeel() && SystemInfo.isWin7OrNewer) {
setState(myToggled);
}
else if (!(getUI() instanceof GtkMenuItemUI)) {
if (myToggled) {
setIcon(ourCheckedIcon);
setDisabledIcon(IconLoader.getDisabledIcon(ourCheckedIcon));
}
else {
setIcon(ourUncheckedIcon);
setDisabledIcon(IconLoader.getDisabledIcon(ourUncheckedIcon));
}
}
}
else {
if (UISettings.getInstance().SHOW_ICONS_IN_MENUS) {
Icon icon = myPresentation.getIcon();
if (action instanceof ToggleAction && ((ToggleAction)action).isSelected(myEvent)) {
icon = new PoppedIcon(icon, 16, 16);
}
setIcon(icon);
if (myPresentation.getDisabledIcon() != null) {
setDisabledIcon(myPresentation.getDisabledIcon());
}
else {
setDisabledIcon(IconLoader.getDisabledIcon(icon));
}
}
}
}
public boolean isToggleable() {
return myToggleable;
}
@Override
public boolean isSelected() {
return myToggled;
}
private final class MenuItemSynchronizer implements PropertyChangeListener, Disposable {
@NonNls private static final String SELECTED = "selected";