From 92d44b6eff55fc3dbeb41f3d9a73511e5ac31bf2 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 19 Oct 2018 19:25:07 +0200 Subject: [PATCH] IDEA-CR-38409 fix TopHitProvidersTest --- .../src/com/intellij/ide/ui/UISettings.kt | 82 +++++++++++++++---- .../daemon/impl/DaemonEditorPopup.java | 4 +- .../com/intellij/util/IJSwingUtilities.java | 2 +- 3 files changed, 71 insertions(+), 17 deletions(-) diff --git a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt index 1a579ed3efeb..da9ee0741018 100644 --- a/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt +++ b/platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.kt @@ -56,11 +56,17 @@ class UISettings(private val notRoamableOptions: NotRoamableUiSettings) : Persis val alwaysShowWindowsButton: Boolean get() = state.alwaysShowWindowsButton - val animateWindows: Boolean + var animateWindows: Boolean get() = state.animateWindows + set(value) { + state.animateWindows = value + } - val showMemoryIndicator: Boolean + var showMemoryIndicator: Boolean get() = state.showMemoryIndicator + set(value) { + state.showMemoryIndicator = value + } var colorBlindness: ColorBlindness? get() = state.colorBlindness @@ -74,8 +80,11 @@ class UISettings(private val notRoamableOptions: NotRoamableUiSettings) : Persis state.hideToolStripes = value } - val hideNavigationOnFocusLoss: Boolean + var hideNavigationOnFocusLoss: Boolean get() = state.hideNavigationOnFocusLoss + set(value) { + state.hideNavigationOnFocusLoss = value + } var reuseNotModifiedTabs: Boolean get() = state.reuseNotModifiedTabs @@ -86,17 +95,29 @@ class UISettings(private val notRoamableOptions: NotRoamableUiSettings) : Persis val maxClipboardContents: Int get() = state.maxClipboardContents - val disableMnemonics: Boolean + var disableMnemonics: Boolean get() = state.disableMnemonics + set(value) { + state.disableMnemonics = value + } - val disableMnemonicsInControls: Boolean + var disableMnemonicsInControls: Boolean get() = state.disableMnemonicsInControls + set(value) { + state.disableMnemonicsInControls = value + } - val dndWithPressedAltOnly: Boolean + var dndWithPressedAltOnly: Boolean get() = state.dndWithPressedAltOnly + set(value) { + state.dndWithPressedAltOnly = value + } - val useSmallLabelsOnTabs: Boolean + var useSmallLabelsOnTabs: Boolean get() = state.useSmallLabelsOnTabs + set(value) { + state.useSmallLabelsOnTabs = value + } val smoothScrolling: Boolean get() = state.smoothScrolling @@ -110,14 +131,26 @@ class UISettings(private val notRoamableOptions: NotRoamableUiSettings) : Persis state.cycleScrolling = value } - val navigateToPreview: Boolean + var navigateToPreview: Boolean get() = state.navigateToPreview + set(value) { + state.navigateToPreview = value + } val scrollTabLayoutInEditor: Boolean get() = state.scrollTabLayoutInEditor - val showToolWindowsNumbers: Boolean + var showToolWindowsNumbers: Boolean get() = state.showToolWindowsNumbers + set(value) { + state.showToolWindowsNumbers = value + } + + var showEditorToolTip: Boolean + get() = state.showEditorToolTip + set(value) { + state.showEditorToolTip = value + } var showNavigationBar: Boolean get() = state.showNavigationBar @@ -131,8 +164,17 @@ class UISettings(private val notRoamableOptions: NotRoamableUiSettings) : Persis state.showStatusBar = value } - val showIconInQuickNavigation: Boolean + var showIconInQuickNavigation: Boolean get() = state.showIconInQuickNavigation + set(value) { + state.showIconInQuickNavigation = value + } + + var moveMouseOnDefaultButton: Boolean + get() = state.moveMouseOnDefaultButton + set(value) { + state.moveMouseOnDefaultButton = value + } var showMainToolbar: Boolean get() = state.showMainToolbar @@ -140,8 +182,11 @@ class UISettings(private val notRoamableOptions: NotRoamableUiSettings) : Persis state.showMainToolbar = value } - val showIconsInMenus: Boolean + var showIconsInMenus: Boolean get() = state.showIconsInMenus + set(value) { + state.showIconsInMenus = value + } var sortLookupElementsLexicographically: Boolean get() = state.sortLookupElementsLexicographically @@ -158,14 +203,23 @@ class UISettings(private val notRoamableOptions: NotRoamableUiSettings) : Persis state.hideKnownExtensionInTabs = value } - val leftHorizontalSplit: Boolean + var leftHorizontalSplit: Boolean get() = state.leftHorizontalSplit + set(value) { + state.leftHorizontalSplit = value + } - val rightHorizontalSplit: Boolean + var rightHorizontalSplit: Boolean get() = state.rightHorizontalSplit + set(value) { + state.rightHorizontalSplit = value + } - val wideScreenSupport: Boolean + var wideScreenSupport: Boolean get() = state.wideScreenSupport + set(value) { + state.wideScreenSupport = value + } val sortBookmarks: Boolean get() = state.sortBookmarks diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonEditorPopup.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonEditorPopup.java index b473c2a36eb7..2487929b40f3 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonEditorPopup.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonEditorPopup.java @@ -62,11 +62,11 @@ public class DaemonEditorPopup extends PopupHandler { component.showComponent(new RelativePoint(comp, new Point(point.x - dimension.width, point.y))); }); - final JBCheckboxMenuItem previewCheckbox = new JBCheckboxMenuItem(IdeBundle.message("checkbox.show.editor.preview.popup"), UISettings.getInstance().getState().getShowEditorToolTip()); + final JBCheckboxMenuItem previewCheckbox = new JBCheckboxMenuItem(IdeBundle.message("checkbox.show.editor.preview.popup"), UISettings.getInstance().getShowEditorToolTip()); popupMenu.addSeparator(); popupMenu.add(previewCheckbox); previewCheckbox.addActionListener(__ -> { - UISettings.getInstance().getState().setShowEditorToolTip(previewCheckbox.isSelected()); + UISettings.getInstance().setShowEditorToolTip(previewCheckbox.isSelected()); UISettings.getInstance().fireUISettingsChanged(); }); diff --git a/platform/platform-impl/src/com/intellij/util/IJSwingUtilities.java b/platform/platform-impl/src/com/intellij/util/IJSwingUtilities.java index 307c1f66e3ab..9dc34d4e4d38 100644 --- a/platform/platform-impl/src/com/intellij/util/IJSwingUtilities.java +++ b/platform/platform-impl/src/com/intellij/util/IJSwingUtilities.java @@ -152,7 +152,7 @@ public class IJSwingUtilities extends JBSwingUtilities { public static void moveMousePointerOn(Component component) { if (component != null && component.isShowing()) { UISettings settings = UISettings.getInstanceOrNull(); - if (settings != null && settings.getState().getMoveMouseOnDefaultButton()) { + if (settings != null && settings.getMoveMouseOnDefaultButton()) { Point point = component.getLocationOnScreen(); int dx = component.getWidth() / 2; int dy = component.getHeight() / 2;