From 7d9c4bf63ea5c8b7e4f4c88874c63a413850b1ff Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Mon, 16 Jan 2017 17:04:05 +0300 Subject: [PATCH] [vcs]: (IDEA-166649) Branches popup: cut tracking branch first --- .../src/com/intellij/dvcs/ui/BranchActionGroupPopup.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java index 213c15b7a282..e867799a24ef 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java @@ -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); }