From 4828593738419dd2b36e24e2542bbdbc07c5bdc0 Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Mon, 19 Mar 2012 15:20:22 +0400 Subject: [PATCH] IDEA-82224 Toolbar decorator: vertical border is too thick (look at the left of '+' button) --- .../src/com/intellij/ui/ToolbarDecorator.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java b/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java index 6ae7c8641b7a..40bba4bb9849 100644 --- a/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java +++ b/platform/platform-api/src/com/intellij/ui/ToolbarDecorator.java @@ -17,7 +17,6 @@ package com.intellij.ui; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.border.CustomLineBorder; import com.intellij.ui.table.TableView; import com.intellij.util.ui.ElementProducer; @@ -89,8 +88,11 @@ public abstract class ToolbarDecorator implements DataProvider, CommonActionsPan } protected ToolbarDecorator initPositionAndBorder() { - myToolbarPosition = SystemInfo.isMac ? ActionToolbarPosition.BOTTOM : ActionToolbarPosition.RIGHT; - myBorder = new CustomLineBorder(0, SystemInfo.isMac ? 0 : 1, 0, 0); + myToolbarPosition = UIUtil.isUnderAquaLookAndFeel() ? ActionToolbarPosition.BOTTOM : ActionToolbarPosition.RIGHT; + myBorder = new CustomLineBorder(0, + myToolbarPosition == ActionToolbarPosition.RIGHT ? 1 : 0, + myToolbarPosition == ActionToolbarPosition.TOP ? 1 : 0, + myToolbarPosition == ActionToolbarPosition.LEFT ? 1 : 0); final JComponent c = getComponent(); if (c != null) { c.setBorder(IdeBorderFactory.createEmptyBorder(0)); @@ -180,6 +182,10 @@ public abstract class ToolbarDecorator implements DataProvider, CommonActionsPan public ToolbarDecorator setToolbarPosition(ActionToolbarPosition position) { myToolbarPosition = position; + myBorder = new CustomLineBorder(0, + myToolbarPosition == ActionToolbarPosition.RIGHT ? 1 : 0, + myToolbarPosition == ActionToolbarPosition.TOP ? 1 : 0, + myToolbarPosition == ActionToolbarPosition.LEFT ? 1 : 0); return this; }