From 17f0dcb14449ba362ada43e4fde5906e21441c74 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 28 Mar 2017 01:33:54 +0300 Subject: [PATCH] IDEA-160900 Settings dialog doesn't fit the screen when using low screen resolution add scroll pane for several configurables --- .../intellij/application/options/CodeCompletionOptions.java | 3 +-- .../src/com/intellij/ide/GeneralSettingsConfigurable.java | 2 +- .../updateSettings/impl/UpdateSettingsConfigurable.java | 4 +--- .../com/intellij/coverage/CoverageOptionsConfigurable.java | 3 +-- .../plugins/terminal/TerminalOptionsConfigurable.java | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java index 950d4208f027..115127e37e38 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java @@ -19,13 +19,12 @@ package com.intellij.application.options; import com.intellij.application.options.editor.EditorOptionsProvider; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.options.BaseConfigurable; -import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; import org.jetbrains.annotations.NotNull; import javax.swing.*; -public class CodeCompletionOptions extends BaseConfigurable implements SearchableConfigurable, EditorOptionsProvider, Configurable.NoScroll { +public class CodeCompletionOptions extends BaseConfigurable implements SearchableConfigurable, EditorOptionsProvider { private CodeCompletionPanel myPanel; @Override diff --git a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java index 44684af2eca3..8c18128c28cd 100644 --- a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java @@ -37,7 +37,7 @@ import java.util.List; *

* A new instance of the specified class will be created each time then the Settings dialog is opened */ -public class GeneralSettingsConfigurable extends CompositeConfigurable implements SearchableConfigurable, Configurable.NoScroll { +public class GeneralSettingsConfigurable extends CompositeConfigurable implements SearchableConfigurable { private static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.generalOptionsProvider"); private MyComponent myComponent; diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java index 3d253cf2feda..379079825f10 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java @@ -24,7 +24,6 @@ import com.intellij.openapi.application.ApplicationInfo; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.ApplicationInfoEx; import com.intellij.openapi.options.BaseConfigurable; -import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -38,7 +37,6 @@ import com.intellij.ui.components.labels.ActionLink; import com.intellij.util.net.NetUtils; import com.intellij.util.text.DateFormatUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.util.List; @@ -46,7 +44,7 @@ import java.util.List; /** * @author pti */ -public class UpdateSettingsConfigurable extends BaseConfigurable implements SearchableConfigurable, Configurable.NoScroll { +public class UpdateSettingsConfigurable extends BaseConfigurable implements SearchableConfigurable { private final UpdateSettings mySettings; private final boolean myCheckNowEnabled; private UpdatesSettingsPanel myPanel; diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageOptionsConfigurable.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageOptionsConfigurable.java index 24f87080b4bd..756d4ff0d45d 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageOptionsConfigurable.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageOptionsConfigurable.java @@ -16,7 +16,6 @@ package com.intellij.coverage; import com.intellij.openapi.extensions.Extensions; -import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -32,7 +31,7 @@ import java.util.List; * User: anna * Date: 12/16/10 */ -public class CoverageOptionsConfigurable implements SearchableConfigurable, Configurable.NoScroll { +public class CoverageOptionsConfigurable implements SearchableConfigurable { private CoverageOptionsPanel myPanel; private final CoverageOptionsProvider myManager; private final Project myProject; diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsConfigurable.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsConfigurable.java index c11cdd07b4ed..e7262e3f7795 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsConfigurable.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalOptionsConfigurable.java @@ -16,7 +16,6 @@ package org.jetbrains.plugins.terminal; import com.intellij.openapi.Disposable; -import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -29,7 +28,7 @@ import javax.swing.*; /** * @author traff */ -public class TerminalOptionsConfigurable implements SearchableConfigurable, Configurable.NoScroll, Disposable { +public class TerminalOptionsConfigurable implements SearchableConfigurable, Disposable { public static final String TERMINAL_SETTINGS_HELP_REFERENCE = "reference.settings.terminal"; private TerminalSettingsPanel myPanel;