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-157041 New notifications: link click area not working

Browse Source 
IDEA-158717 Notification link cannot be clicked
This commit is contained in:
Alexander Lobas
2016-07-20 17:42:14 +03:00
parent f2626b9024
commit ffd60882df
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
+18 -6
View File
@@ -68,9 +68,8 @@ import javax.swing.plaf.ButtonUI;
import javax.swing.plaf.ColorUIResource;
import javax.swing.plaf.UIResource;
import javax.swing.text.*;
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.*;
import javax.swing.text.html.ParagraphView;
import javax.swing.text.html.StyleSheet;
import java.awt.*;
import java.awt.event.*;
import java.awt.geom.Rectangle2D;
@@ -791,6 +790,10 @@ public class NotificationsManagerImpl extends NotificationsManager {
hoverAdapter.addSource(text);
hoverAdapter.addSource(pane);
if (buttons == null && actions) {
createActionPanel(notification, centerPanel, layoutData.configuration.actionGap, hoverAdapter);
}
if (expandAction != null) {
hoverAdapter.addComponent(expandAction, component -> {
Rectangle bounds;
@@ -809,10 +812,6 @@ public class NotificationsManagerImpl extends NotificationsManager {
});
}
if (buttons == null && actions) {
createActionPanel(notification, centerPanel, layoutData.configuration.actionGap, hoverAdapter);
}
hoverAdapter.initListeners();
if (layoutData.mergeData != null) {
@@ -981,6 +980,18 @@ public class NotificationsManagerImpl extends NotificationsManager {
}
private void handleEvent(MouseEvent e, boolean pressed, boolean moved) {
if (e.getSource() instanceof JEditorPane) {
JEditorPane pane = (JEditorPane)e.getSource();
int pos = pane.viewToModel(e.getPoint());
if (pos >= 0) {
HTMLDocument document = (HTMLDocument)pane.getDocument();
AttributeSet attributes = document.getCharacterElement(pos).getAttributes();
if (attributes.getAttribute(HTML.Tag.A) != null) {
return;
}
}
}
for (Pair<Component, ?> p : myComponents) {
Component component = p.first;
Rectangle bounds;
@@ -989,6 +1000,7 @@ public class NotificationsManagerImpl extends NotificationsManager {
JBInsets.addTo(bounds, (Insets)p.second);
}
else {
//noinspection unchecked
bounds = ((Function<Component, Rectangle>)p.second).fun(component);
}
if (bounds.contains(SwingUtilities.convertPoint(e.getComponent(), e.getPoint(), component.getParent()))) {