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

Remove Aqua NavBar painter

Browse Source 
GitOrigin-RevId: c3f5ba790d67b8952f8c33e382bd2f300f431ac1
This commit is contained in:
Konstantin Bulenkov
2019-07-02 06:52:16 +03:00
committed by intellij-monorepo-bot
parent ab3c39a667
commit f1a577d70d
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
-5
View File
@@ -16,7 +16,6 @@ import com.intellij.openapi.wm.impl.IdeFrameImpl;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.util.ui.JBSwingUtilities;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
@@ -199,10 +198,6 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
Rectangle rectangle = new Rectangle(0, 0, r.width + insets.left + insets.right, r.height + insets.top + insets.bottom);
NavBarUIManager.getUI().doPaintNavBarPanel(g2d, rectangle, isMainToolbarVisible(), isUndocked());
if (UIUtil.isUnderAquaLookAndFeel() && isUndocked()) {
Rectangle bounds = getParent().getBounds();
NavBarUIManager.getUI().doPaintWrapperPanel(g2d, bounds, false);
}
g2d.dispose();
}
platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/AquaNavBarUI.java
+1
View File
@@ -22,6 +22,7 @@ import com.intellij.util.ui.UIUtil;
import java.awt.*;
/**
* @deprecated will be removed 2020.1
* @author Konstantin Bulenkov
*/
public class AquaNavBarUI extends AbstractNavBarUI {
platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/NavBarUIManager.java
+5 -3
View File
@@ -21,14 +21,16 @@ import com.intellij.util.ui.UIUtil;
* @author Konstantin Bulenkov
*/
public class NavBarUIManager {
public static final NavBarUI AQUA = new AquaNavBarUI();
public static final NavBarUI COMMON = new CommonNavBarUI();
/**
* @deprecated will be removal in 2020.1
*/
public static final NavBarUI AQUA = COMMON;
public static final NavBarUI DARCULA = new DarculaNavBarUI();
public static NavBarUI getUI() {
if (UIUtil.isUnderAquaLookAndFeel()) return AQUA;
if (UIUtil.isUnderDarcula()) return DARCULA;
if (UIUtil.isUnderDarcula()) return DARCULA;
return COMMON;
}
}