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

RDCT-1092 Hotkeys are displayed incorrectly in popups on different OS

Browse Source 
replace SystemInfo.isMac with ClientSystemInfo.isMac() in keyboard-shortcuts-related code

GitOrigin-RevId: 640604dff8e09d1aeccd0edc156873dd63c09fea
This commit is contained in:
Dmitry Batrak
2024-04-22 19:16:22 +00:00
committed by intellij-monorepo-bot
parent 21bbfdc1d3
commit 881b370b95
59 changed files with 174 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaAnonymousClassesNodeProvider.java
+2 -2
View File
@@ -9,9 +9,9 @@ import com.intellij.ide.util.treeView.smartTree.TreeElement;
import com.intellij.navigation.AnonymousElementProvider;
import com.intellij.openapi.actionSystem.KeyboardShortcut;
import com.intellij.openapi.actionSystem.Shortcut;
import com.intellij.openapi.client.ClientSystemInfo;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.util.PropertyOwner;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.psi.PsiAnonymousClass;
import com.intellij.psi.PsiElement;
import com.intellij.ui.IconManager;
@@ -59,7 +59,7 @@ public final class JavaAnonymousClassesNodeProvider
@Override
public Shortcut @NotNull [] getShortcut() {
return new Shortcut[]{KeyboardShortcut.fromString(SystemInfo.isMac ? "meta I" : "control I")};
return new Shortcut[]{KeyboardShortcut.fromString(ClientSystemInfo.isMac() ? "meta I" : "control I")};
}
@Override
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaLambdaNodeProvider.java
+2 -2
View File
@@ -9,9 +9,9 @@ import com.intellij.ide.util.treeView.smartTree.ActionPresentationData;
import com.intellij.ide.util.treeView.smartTree.TreeElement;
import com.intellij.openapi.actionSystem.KeyboardShortcut;
import com.intellij.openapi.actionSystem.Shortcut;
import com.intellij.openapi.client.ClientSystemInfo;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.util.PropertyOwner;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiLambdaExpression;
import com.intellij.psi.PsiMember;
@@ -49,7 +49,7 @@ public class JavaLambdaNodeProvider implements FileStructureNodeProvider<JavaLam
@Override
public Shortcut @NotNull [] getShortcut() {
return new Shortcut[]{KeyboardShortcut.fromString(SystemInfo.isMac ? "meta L" : "control L")};
return new Shortcut[]{KeyboardShortcut.fromString(ClientSystemInfo.isMac() ? "meta L" : "control L")};
}
@NotNull