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

IDEA-149210 Rework IDE notifications

Browse Source
This commit is contained in:
Alexander Lobas
2016-04-19 15:39:51 +03:00
parent 7553debfed
commit 4e5b9e0f5e
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
+4 -1
View File
@@ -661,7 +661,10 @@ public class NotificationsManagerImpl extends NotificationsManager {
configureBalloonScrollPane(pane);
if (!showFullContent && layoutData.twoLineHeight < layoutData.fullHeight) {
if (showFullContent) {
pane.setPreferredSize(text.getPreferredSize());
}
else if (layoutData.twoLineHeight < layoutData.fullHeight) {
text.setPreferredSize(null);
Dimension size = text.getPreferredSize();
size.height = layoutData.twoLineHeight;
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
+13 -3
View File
@@ -21,6 +21,7 @@ import com.intellij.ide.RecentProjectsManager;
import com.intellij.internal.statistic.UsageTrigger;
import com.intellij.notification.NotificationType;
import com.intellij.notification.impl.IdeNotificationArea;
import com.intellij.notification.impl.NotificationsManagerImpl;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.MnemonicHelper;
import com.intellij.openapi.actionSystem.*;
@@ -126,7 +127,12 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, AccessibleCont
}
});
myBalloonLayout = new WelcomeBalloonLayoutImpl(rootPane, JBUI.insets(8), myScreen.myEventListener, myScreen.myEventLocation);
if (NotificationsManagerImpl.newEnabled()) {
myBalloonLayout = new WelcomeBalloonLayoutImpl(rootPane, JBUI.insets(8), myScreen.myEventListener, myScreen.myEventLocation);
}
else {
myBalloonLayout = new BalloonLayoutImpl(rootPane, JBUI.insets(8));
}
WelcomeFrame.setupCloseAction(this);
MnemonicHelper.init(this);
@@ -142,7 +148,9 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, AccessibleCont
public void dispose() {
saveLocation(getBounds());
super.dispose();
((WelcomeBalloonLayoutImpl)myBalloonLayout).dispose();
if (myBalloonLayout instanceof WelcomeBalloonLayoutImpl) {
((WelcomeBalloonLayoutImpl)myBalloonLayout).dispose();
}
Disposer.dispose(myScreen);
WelcomeFrame.resetInstance();
}
@@ -282,7 +290,9 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, AccessibleCont
}
toolbar.setLayout(new BoxLayout(toolbar, BoxLayout.X_AXIS));
toolbar.add(createEventsLink());
if (NotificationsManagerImpl.newEnabled()) {
toolbar.add(createEventsLink());
}
toolbar.add(createActionLink("Configure", IdeActions.GROUP_WELCOME_SCREEN_CONFIGURE, AllIcons.General.GearPlain, !registeredVisible));
toolbar.add(createActionLink("Get Help", IdeActions.GROUP_WELCOME_SCREEN_DOC, null, false));
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeBalloonLayoutImpl.java
+5 -1
View File
@@ -165,9 +165,13 @@ public class WelcomeBalloonLayoutImpl extends BalloonLayoutImpl {
private void layoutPopup() {
Dimension layeredSize = myLayeredPane.getSize();
Dimension size = new Dimension(myPopupBalloon.getPreferredSize());
Point location = myButtonLocation.compute();
int x = layeredSize.width - size.width - 5;
int fullHeight = myButtonLocation.compute().y;
int fullHeight = location.y;
if (x > location.x) {
x = location.x - 20;
}
if (size.height > fullHeight) {
size.height = fullHeight;
}