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

[vcs-log] align diff preview toolbar with main toolbar, add side border

Browse Source
This commit is contained in:
Julia Beliaeva
2018-05-09 19:31:33 +03:00
parent 598ffb0694
commit a7ded60f98
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
+4 -2
View File
@@ -97,8 +97,9 @@ public abstract class DiffRequestProcessor implements Disposable {
@NotNull private final JPanel myPanel;
@NotNull private final MyPanel myMainPanel;
@NotNull private final Wrapper myContentPanel;
@NotNull protected final Wrapper myContentPanel;
@NotNull private final ActionToolbar myToolbar;
@NotNull protected final Wrapper myToolbarWrapper;
@NotNull private final Wrapper myToolbarStatusPanel;
@NotNull private final MyProgressBar myProgressBar;
@@ -138,11 +139,12 @@ public abstract class DiffRequestProcessor implements Disposable {
myToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.DIFF_TOOLBAR, myToolbarGroup, true);
myToolbar.setTargetComponent(myMainPanel);
myToolbarWrapper = new Wrapper(myToolbar.getComponent());
myPanel = JBUI.Panels.simplePanel(myMainPanel);
JPanel statusPanel = JBUI.Panels.simplePanel(myToolbarStatusPanel).addToLeft(myProgressBar);
JPanel topPanel = JBUI.Panels.simplePanel(myToolbar.getComponent()).addToRight(statusPanel);
JPanel topPanel = JBUI.Panels.simplePanel(myToolbarWrapper).addToRight(statusPanel);
Splitter bottomContentSplitter = new JBSplitter(true, "DiffRequestProcessor.BottomComponentSplitter", 0.8f);
bottomContentSplitter.setFirstComponent(myContentPanel);
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
+1
View File
@@ -136,6 +136,7 @@ public class MainFrame extends JPanel implements DataProvider, Disposable {
myTextFilter = myFilterUi.createTextFilter();
myToolbar = createActionsToolbar();
myChangesBrowser.setToolbarHeightReferent(myToolbar);
myPreviewDiff.getToolbarWrapper().setVerticalSizeReferent(myToolbar);
JComponent toolbars = new JPanel(new BorderLayout());
toolbars.add(myToolbar, BorderLayout.NORTH);
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogChangeProcessor.java
+8
View File
@@ -9,6 +9,8 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangeViewDiffRequestProcessor;
import com.intellij.openapi.vcs.changes.ui.ChangesTree;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.SideBorder;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.tree.TreeUtil;
import org.jetbrains.annotations.NotNull;
@@ -24,9 +26,15 @@ class VcsLogChangeProcessor extends ChangeViewDiffRequestProcessor {
public VcsLogChangeProcessor(@NotNull Project project, @NotNull VcsLogChangesBrowser browser, @NotNull Disposable disposable) {
super(project, DiffPlaces.VCS_LOG_VIEW);
myBrowser = browser;
myContentPanel.setBorder(IdeBorderFactory.createBorder(SideBorder.TOP));
Disposer.register(disposable, this);
}
@NotNull
public com.intellij.ui.components.panels.Wrapper getToolbarWrapper() {
return myToolbarWrapper;
}
@NotNull
@Override
protected List<Wrapper> getSelectedChanges() {