From f2c905de9a14fe74138900431cacc34aa72b1da1 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Tue, 18 Mar 2014 21:50:47 +0400 Subject: [PATCH] fix extra border --- .../NavBarRootPaneExtension.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java index 474f8ddcee05..d92f4aec742b 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java @@ -196,6 +196,11 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension { } private JComponent buildNavBarPanel() { + myNavigationBar = new NavBarPanel(myProject, true); + myWrapperPanel.putClientProperty("NavBarPanel", myNavigationBar); + myNavigationBar.getModel().setFixedComponent(true); + myScrollPane = ScrollPaneFactory.createScrollPane(myNavigationBar); + JPanel panel = new JPanel(new BorderLayout()) { @Override @@ -232,22 +237,23 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension { navBar.setBounds(x, (r.height - preferredSize.height) / 2, r.width - insets.left - insets.right, preferredSize.height); } + + @Override + public void updateUI() { + super.updateUI(); + myScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); + myScrollPane.setHorizontalScrollBar(null); + myScrollPane.setBorder(new NavBarBorder(true, 0)); + myScrollPane.setOpaque(false); + myScrollPane.getViewport().setOpaque(false); + myScrollPane.setViewportBorder(null); + setOpaque(true); + myNavigationBar.setBorder(null); + } }; - myNavigationBar = new NavBarPanel(myProject, true); - myWrapperPanel.putClientProperty("NavBarPanel", myNavigationBar); - myNavigationBar.getModel().setFixedComponent(true); - - myScrollPane = ScrollPaneFactory.createScrollPane(myNavigationBar); - myScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); - myScrollPane.setHorizontalScrollBar(null); - myScrollPane.setBorder(new NavBarBorder(true, 0)); - myScrollPane.setOpaque(false); - myScrollPane.getViewport().setOpaque(false); - panel.setOpaque(true); - myNavigationBar.setBorder(null); panel.add(myScrollPane, BorderLayout.CENTER); - + panel.updateUI(); return panel; }