From 1c9be9e282051f72ed2e3b3eb8fd7864ffa57c0f Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 30 Jan 2012 13:29:24 +0400
Subject: [PATCH] IDEA-76525 Git: "Branch not fully merged" dialog layout

---
 .../src/git4idea/ui/GitCommitListWithDiffPanel.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/ui/GitCommitListWithDiffPanel.java b/plugins/git4idea/src/git4idea/ui/GitCommitListWithDiffPanel.java
index 9616c7740db8..098c21c8302f 100644
--- a/plugins/git4idea/src/git4idea/ui/GitCommitListWithDiffPanel.java
+++ b/plugins/git4idea/src/git4idea/ui/GitCommitListWithDiffPanel.java
@@ -24,6 +24,7 @@ import git4idea.history.browser.GitCommit;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
+import java.awt.*;
 import java.util.Collections;
 import java.util.List;
 
@@ -35,24 +36,24 @@ import java.util.List;
  */
 public class GitCommitListWithDiffPanel extends JPanel {
 
-  private final Project myProject;
   private final ChangesBrowser myChangesBrowser;
   private final GitCommitListPanel myCommitListPanel;
 
-  public GitCommitListWithDiffPanel(Project project, List<GitCommit> commits) {
-    myProject = project;
+  public GitCommitListWithDiffPanel(@NotNull Project project, @NotNull List<GitCommit> commits) {
+    super(new BorderLayout());
 
-    myCommitListPanel = new GitCommitListPanel(myProject, commits);
+    myCommitListPanel = new GitCommitListPanel(project, commits);
     myCommitListPanel.addListSelectionListener(new Consumer<GitCommit>() {
       @Override public void consume(GitCommit commit) {
         myChangesBrowser.setChangesToDisplay(commit.getChanges());
       }
     });
 
-    myChangesBrowser = new ChangesBrowser(myProject, null, Collections.<Change>emptyList(), null, false, true, null, ChangesBrowser.MyUseCase.LOCAL_CHANGES, null);
+    myChangesBrowser = new ChangesBrowser(project, null, Collections.<Change>emptyList(), null, false, true, null, ChangesBrowser.MyUseCase.LOCAL_CHANGES, null);
     myCommitListPanel.registerDiffAction(myChangesBrowser.getDiffAction());
 
     Splitter splitter = new Splitter(false, 0.7f);
+    splitter.setHonorComponentsMinimumSize(false);
     splitter.setFirstComponent(myCommitListPanel);
     splitter.setSecondComponent(myChangesBrowser);
     add(splitter);
-- 
2.23.3