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: make splitter thinner

Browse Source 
* do not paint icon on it
This commit is contained in:
Aleksey Pivovarov
2018-08-17 14:36:40 +03:00
committed by Aleksey Pivovarov
parent b161e21826
commit 86706d60b4
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java
+20 -8
View File
@@ -16,7 +16,6 @@
package com.intellij.diff.tools.util;
import com.intellij.diff.util.DiffUtil;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.ActionToolbar;
import com.intellij.openapi.actionSystem.AnAction;
@@ -36,12 +35,14 @@ import java.util.List;
public class DiffSplitter extends Splitter {
public static final int DIVIDER_WIDTH = JBUI.scale(20);
@Nullable private Painter myPainter;
@Nullable private AnAction myTopAction;
@Nullable private AnAction myBottomAction;
public DiffSplitter() {
setDividerWidth(JBUI.scale(30));
setDividerWidth(DIVIDER_WIDTH);
}
@Override
@@ -58,17 +59,27 @@ public class DiffSplitter extends Splitter {
GridBag bag = new GridBag();
JComponent button1 = syncComponents.get(0);
JComponent button2 = syncComponents.get(1);
if (syncComponents.get(0) != null) {
add(syncComponents.get(0), bag.nextLine());
add(Box.createVerticalStrut(JBUI.scale(20)), bag.nextLine());
if (button1 != null) {
int width = button1.getPreferredSize().width;
if (getDividerWidth() < width) setDividerWidth(width);
}
if (button2 != null) {
int width = button2.getPreferredSize().width;
if (getDividerWidth() < width) setDividerWidth(width);
}
add(new JLabel(AllIcons.General.SplitGlueH), bag.nextLine());
if (syncComponents.get(1) != null) {
if (button1 != null) {
add(button1, bag.nextLine());
}
if (button1 != null && button2 != null) {
add(Box.createVerticalStrut(JBUI.scale(20)), bag.nextLine());
add(syncComponents.get(1), bag.nextLine());
}
if (button2 != null) {
add(button2, bag.nextLine());
}
@@ -112,6 +123,7 @@ public class DiffSplitter extends Splitter {
if (action == null) return null;
ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar("DiffSplitter", new DefaultActionGroup(action), true);
toolbar.updateActionsImmediately();
toolbar.setReservePlaceAutoPopupIcon(false);
toolbar.getComponent().setCursor(Cursor.getDefaultCursor());
return toolbar.getComponent();
platform/diff-impl/src/com/intellij/diff/tools/util/ThreeDiffSplitter.java
+1 -2
View File
@@ -18,7 +18,6 @@ package com.intellij.diff.tools.util;
import com.intellij.diff.tools.util.DiffSplitter.Painter;
import com.intellij.diff.util.Side;
import com.intellij.icons.AllIcons;
import com.intellij.util.ui.JBUI;
import org.jetbrains.annotations.CalledInAwt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -151,7 +150,7 @@ public class ThreeDiffSplitter extends JPanel {
}
private static int getDividerWidth() {
return JBUI.scale(30);
return DiffSplitter.DIVIDER_WIDTH;
}
private class Divider extends JPanel {