From a7f3ae8adc3285f2a765ad7c4e0b96eb248d2535 Mon Sep 17 00:00:00 2001 From: Kirill Kalishev Date: Fri, 19 Aug 2011 13:31:25 +0400 Subject: [PATCH 01/22] JBTabs pref size fixed --- .../src/com/intellij/ui/tabs/impl/JBTabsImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java index 3bd96f3e7d0c..01ccfb016bda 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java @@ -2121,8 +2121,15 @@ public class JBTabsImpl extends JComponent private void addHeaderSize(Dimension size, final int tabsCount) { Dimension header = computeHeaderPreferredSize(tabsCount); - size.height += header.height; - size.width += header.width; + final boolean horizontal = getTabsPosition() == JBTabsPosition.top || getTabsPosition() == JBTabsPosition.bottom; + if (horizontal) { + size.height += header.height; + size.width = Math.max(size.width, header.width); + } + else { + size.height += Math.max(size.height, header.height); + size.width += header.width; + } final Insets insets = getLayoutInsets(); size.width += insets.left + insets.right + 1; From b6ac0116cd78744e6c02b70d4f43dd5af6a4434f Mon Sep 17 00:00:00 2001 From: Kirill Kalishev Date: Fri, 19 Aug 2011 14:00:22 +0400 Subject: [PATCH 02/22] balloon: optional small variant --- .../inplace/AbstractInplaceVariableIntroducer.java | 2 +- .../com/intellij/openapi/ui/popup/BalloonBuilder.java | 3 +++ .../platform-impl/src/com/intellij/ui/BalloonImpl.java | 9 +++++---- .../com/intellij/ui/popup/BalloonPopupBuilderImpl.java | 10 +++++++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceVariableIntroducer.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceVariableIntroducer.java index 794ab43b0284..087b64c10c65 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceVariableIntroducer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/AbstractInplaceVariableIntroducer.java @@ -136,7 +136,7 @@ public abstract class AbstractInplaceVariableIntroducer ex final JComponent component = getComponent(); if (component == null) return; if (ApplicationManager.getApplication().isHeadlessEnvironment()) return; - final BalloonBuilder balloonBuilder = JBPopupFactory.getInstance().createDialogBalloonBuilder(component, null); + final BalloonBuilder balloonBuilder = JBPopupFactory.getInstance().createDialogBalloonBuilder(component, null).setSmallVariant(true); myBalloon = balloonBuilder.createBalloon(); Disposer.register(myBalloon, new Disposable() { @Override diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/BalloonBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/BalloonBuilder.java index 45674e3c1224..cd1e250cd8c6 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/popup/BalloonBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/BalloonBuilder.java @@ -87,4 +87,7 @@ public interface BalloonBuilder { @NotNull BalloonBuilder setShadow(boolean shadow); + + @NotNull + BalloonBuilder setSmallVariant(boolean smallVariant); } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java index 6a8df8a508cb..13d86fda5d30 100644 --- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java @@ -148,7 +148,7 @@ public class BalloonImpl implements Disposable, Balloon, LightweightWindow, Posi private boolean myAnimationEnabled = true; private boolean myShadow = false; - public boolean isInsideBalloon(MouseEvent me) { + public boolean isInsideBalloon(MouseEvent me) { return isInside(new RelativePoint(me)); } @@ -202,7 +202,8 @@ public class BalloonImpl implements Disposable, Balloon, LightweightWindow, Posi boolean dialogMode, String title, Insets contentInsets, - boolean shadow) { + boolean shadow, + boolean smallVariant) { myBorderColor = borderColor; myFillColor = fillColor; myContent = content; @@ -248,7 +249,7 @@ public class BalloonImpl implements Disposable, Balloon, LightweightWindow, Posi myFadeoutTime = fadeoutTime; myAnimationCycle = animationCycle; - if (myDialogMode) { + if (smallVariant) { new AwtVisitor(myContent) { @Override public boolean visit(Component component) { @@ -1455,7 +1456,7 @@ public class BalloonImpl implements Disposable, Balloon, LightweightWindow, Posi //pane.setBorder(new LineBorder(Color.blue)); balloon.set(new BalloonImpl(new JLabel("FUCK"), Color.black, MessageType.ERROR.getPopupBackground(), true, true, true, true, true, 0, true, null, false, 500, 5, 0, 0, false, "This is the title", - new Insets(2, 2, 2, 2), true)); + new Insets(2, 2, 2, 2), true, false)); balloon.get().setShowPointer(true); if (e.isShiftDown()) { diff --git a/platform/platform-impl/src/com/intellij/ui/popup/BalloonPopupBuilderImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/BalloonPopupBuilderImpl.java index 1ddaf04b7e5e..45e6746da195 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/BalloonPopupBuilderImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/BalloonPopupBuilderImpl.java @@ -52,6 +52,7 @@ public class BalloonPopupBuilderImpl implements BalloonBuilder { private String myTitle; private Insets myContentInsets = new Insets(2, 2, 2, 2); private boolean myShadow = false; + private boolean mySmallVariant = false; public BalloonPopupBuilderImpl(@NotNull final JComponent content) { myContent = content; @@ -148,7 +149,7 @@ public class BalloonPopupBuilderImpl implements BalloonBuilder { @NotNull public Balloon createBalloon() { return new BalloonImpl(myContent, myBorder, myFill, myHideOnMouseOutside, myHideOnKeyOutside, myHideOnAction, myShowCalllout, myCloseButtonEnabled, myFadeoutTime, myHideOnFrameResize, myClickHandler, myCloseOnClick, myAnimationCycle, - myCalloutShift, myPositionChangeXShift, myPositionChangeYShift, myDialogMode, myTitle, myContentInsets, myShadow); + myCalloutShift, myPositionChangeXShift, myPositionChangeYShift, myDialogMode, myTitle, myContentInsets, myShadow, mySmallVariant); } @NotNull @@ -191,4 +192,11 @@ public class BalloonPopupBuilderImpl implements BalloonBuilder { myShadow = shadow; return this; } + + @NotNull + @Override + public BalloonBuilder setSmallVariant(boolean smallVariant) { + mySmallVariant = smallVariant; + return this; + } } From aca5751fcf6bbad4e74f65173feec7dfda059298 Mon Sep 17 00:00:00 2001 From: Kirill Kalishev Date: Fri, 19 Aug 2011 16:06:20 +0400 Subject: [PATCH 03/22] funcTests: template project updated --- platform/funcTests/project1/.idea/vcs.xml | 3 -- .../funcTests/project1/.idea/workspace.xml | 44 +++++++------------ .../project1/module1/scripts/suite.ijs | 3 +- 3 files changed, 18 insertions(+), 32 deletions(-) diff --git a/platform/funcTests/project1/.idea/vcs.xml b/platform/funcTests/project1/.idea/vcs.xml index f05d78fd07e1..def6a6a18457 100644 --- a/platform/funcTests/project1/.idea/vcs.xml +++ b/platform/funcTests/project1/.idea/vcs.xml @@ -1,8 +1,5 @@ - - diff --git a/platform/funcTests/project1/.idea/workspace.xml b/platform/funcTests/project1/.idea/workspace.xml index 645d39a9b216..470bc5e4dcfb 100644 --- a/platform/funcTests/project1/.idea/workspace.xml +++ b/platform/funcTests/project1/.idea/workspace.xml @@ -71,17 +71,7 @@ - - - - - - - - - - - + @@ -100,10 +90,10 @@ - @@ -118,7 +108,7 @@ - @@ -133,7 +123,6 @@ - @@ -210,6 +199,7 @@ + @@ -227,8 +217,8 @@ - + @@ -252,7 +242,6 @@ - + @@ -371,16 +360,19 @@ - - + + + +