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

IDEA-102056 Settings->Editor->Colors&Fonts could use splitter between settings and preview

Browse Source
This commit is contained in:
Rustam Vishnyakov
2016-03-11 20:41:51 +03:00
parent 091785d46d
commit e544e98141
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/colors/NewColorAndFontPanel.java
+7 -2
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.options.colors.ColorSettingsPage;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.GuiUtils;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -78,8 +79,12 @@ public class NewColorAndFontPanel extends JPanel {
// We don't want to show non-used preview panel (it's considered to be not in use if it doesn't contain text).
if (myPreviewPanel.getPanel() != null && (page == null || !StringUtil.isEmptyOrSpaces(page.getDemoText()))) {
add(top, BorderLayout.NORTH);
add(myPreviewPanel.getPanel(), BorderLayout.CENTER);
@SuppressWarnings("SuspiciousNameCombination")
JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, top, myPreviewPanel.getPanel());
splitPane.setBorder(BorderFactory.createEmptyBorder());
splitPane.setContinuousLayout(true);
add(splitPane);
GuiUtils.replaceJSplitPaneWithIDEASplitter(splitPane);
}
else {
add(top, BorderLayout.CENTER);
platform/lang-impl/src/com/intellij/application/options/colors/OptionsPanelImpl.java
+2 -5
View File
@@ -100,12 +100,9 @@ public class OptionsPanelImpl extends JPanel implements OptionsPanel {
});
JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myOptionsTree);
scrollPane.setPreferredSize(JBUI.size(230, 60));
JPanel north = new JPanel(new BorderLayout());
north.add(scrollPane, BorderLayout.CENTER);
north.add(myOptionsPanel, BorderLayout.EAST);
add(scrollPane, BorderLayout.CENTER);
add(myOptionsPanel, BorderLayout.EAST);
add(north, BorderLayout.NORTH);
}
@Override