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

diff: add border to DiffViewer in color settings

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-04-13 18:07:59 +03:00
committed by Aleksey Pivovarov
parent 4fd63709d0
commit f487eba3f4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
+7 -1
View File
@@ -41,13 +41,16 @@ import com.intellij.openapi.editor.ex.util.EditorUtil;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.util.EventDispatcher;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.JBUI;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import javax.swing.*;
import java.awt.*;
import java.util.List;
@@ -55,6 +58,7 @@ import java.util.List;
* The panel from the Settings, that allows to see changes to diff/merge coloring scheme right away.
*/
class DiffPreviewPanel implements PreviewPanel {
private final JPanel myPanel;
private final SimpleThreesideDiffViewer myViewer;
private final EventDispatcher<ColorAndFontSettingsListener> myDispatcher = EventDispatcher.create(ColorAndFontSettingsListener.class);
@@ -76,11 +80,13 @@ class DiffPreviewPanel implements PreviewPanel {
editor.addEditorMouseListener(clickListener);
editor.getCaretModel().addCaretListener(clickListener);
}
myPanel = JBUI.Panels.simplePanel(myViewer.getComponent()).withBorder(IdeBorderFactory.createBorder());
}
@Override
public Component getPanel() {
return myViewer.getComponent();
return myPanel;
}
@Override