[vcs]: (IDEA-166649) Branches popup: cut tracking branch first

This commit is contained in:
Nadya Zabrodina
2017-01-16 20:26:18 +03:00
parent a4dc0ee236
commit 7d9c4bf63e
@@ -265,10 +265,12 @@ public class BranchActionGroupPopup extends FlatSpeedSearchPopup {
JPanel compoundPanel = new OpaquePanel(new BorderLayout(), JBColor.WHITE);
myIconLabel = new IconComponent();
myInfoLabel.setHorizontalAlignment(SwingConstants.RIGHT);
JPanel textPanel = new OpaquePanel(new BorderLayout(), compoundPanel.getBackground());
compoundPanel.add(myIconLabel, BorderLayout.WEST);
compoundPanel.add(myTextLabel, BorderLayout.CENTER);
compoundPanel.add(myInfoLabel, BorderLayout.EAST);
textPanel.add(myTextLabel, BorderLayout.WEST);
textPanel.add(myInfoLabel, BorderLayout.CENTER);
compoundPanel.add(textPanel, BorderLayout.CENTER);
return layoutComponent(compoundPanel);
}