author | serb |
Tue, 01 Oct 2019 10:28:12 -0700 | |
changeset 58597 | 4ff14948c6a1 |
parent 53794 | c2b366b9c360 |
permissions | -rw-r--r-- |
12047 | 1 |
/* |
47508
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. |
12047 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
package sun.lwawt.macosx; |
|
27 |
||
47508
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
28 |
import java.awt.AWTEvent; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
29 |
import java.awt.Button; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
30 |
import java.awt.Frame; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
31 |
import java.awt.Graphics2D; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
32 |
import java.awt.GraphicsConfiguration; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
33 |
import java.awt.GraphicsDevice; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
34 |
import java.awt.GraphicsEnvironment; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
35 |
import java.awt.Image; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
36 |
import java.awt.MediaTracker; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
37 |
import java.awt.PopupMenu; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
38 |
import java.awt.RenderingHints; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
39 |
import java.awt.Toolkit; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
40 |
import java.awt.Transparency; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
41 |
import java.awt.TrayIcon; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
42 |
import java.awt.event.ActionEvent; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
43 |
import java.awt.event.MouseEvent; |
12047 | 44 |
import java.awt.geom.Point2D; |
45 |
import java.awt.image.BufferedImage; |
|
50649
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
46 |
import java.awt.image.ImageObserver; |
12047 | 47 |
import java.awt.peer.TrayIconPeer; |
47508
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
48 |
|
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
49 |
import javax.swing.Icon; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
50 |
import javax.swing.UIManager; |
12047 | 51 |
|
47508
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
52 |
import sun.awt.SunToolkit; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
53 |
|
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
54 |
import static sun.awt.AWTAccessor.MenuComponentAccessor; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
55 |
import static sun.awt.AWTAccessor.getMenuComponentAccessor; |
30469 | 56 |
|
12047 | 57 |
public class CTrayIcon extends CFRetainedResource implements TrayIconPeer { |
58 |
private TrayIcon target; |
|
59 |
private PopupMenu popup; |
|
60 |
||
14157
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
61 |
// In order to construct MouseEvent object, we need to specify a |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
62 |
// Component target. Because TrayIcon isn't Component's subclass, |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
63 |
// we use this dummy frame instead |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
64 |
private final Frame dummyFrame; |
50649
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
65 |
IconObserver observer = new IconObserver(); |
14157
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
66 |
|
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
67 |
// A bitmask that indicates what mouse buttons produce MOUSE_CLICKED events |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
68 |
// on MOUSE_RELEASE. Click events are only generated if there were no drag |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
69 |
// events between MOUSE_PRESSED and MOUSE_RELEASED for particular button |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
70 |
private static int mouseClickButtons = 0; |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
71 |
|
12047 | 72 |
CTrayIcon(TrayIcon target) { |
73 |
super(0, true); |
|
74 |
||
75 |
this.target = target; |
|
76 |
this.popup = target.getPopupMenu(); |
|
14157
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
77 |
this.dummyFrame = new Frame(); |
12047 | 78 |
setPtr(createModel()); |
79 |
||
80 |
//if no one else is creating the peer. |
|
81 |
checkAndCreatePopupPeer(); |
|
82 |
updateImage(); |
|
83 |
} |
|
84 |
||
85 |
private CPopupMenu checkAndCreatePopupPeer() { |
|
86 |
CPopupMenu menuPeer = null; |
|
87 |
if (popup != null) { |
|
88 |
try { |
|
30469 | 89 |
final MenuComponentAccessor acc = getMenuComponentAccessor(); |
90 |
menuPeer = acc.getPeer(popup); |
|
12047 | 91 |
if (menuPeer == null) { |
92 |
popup.addNotify(); |
|
30469 | 93 |
menuPeer = acc.getPeer(popup); |
12047 | 94 |
} |
23247
dd6c58eeb05c
8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents:
18241
diff
changeset
|
95 |
} catch (Exception e) { |
12047 | 96 |
e.printStackTrace(); |
97 |
} |
|
98 |
} |
|
99 |
return menuPeer; |
|
100 |
} |
|
101 |
||
102 |
private long createModel() { |
|
103 |
return nativeCreate(); |
|
104 |
} |
|
105 |
||
106 |
private native long nativeCreate(); |
|
107 |
||
108 |
//invocation from the AWTTrayIcon.m |
|
37686
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
109 |
public long getPopupMenuModel() { |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
110 |
PopupMenu newPopup = target.getPopupMenu(); |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
111 |
|
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
112 |
if (popup == newPopup) { |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
113 |
if (popup == null) { |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
114 |
return 0L; |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
115 |
} |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
116 |
} else { |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
117 |
if (newPopup != null) { |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
118 |
if (popup != null) { |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
119 |
popup.removeNotify(); |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
120 |
popup = newPopup; |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
121 |
} else { |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
122 |
popup = newPopup; |
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
123 |
} |
23247
dd6c58eeb05c
8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents:
18241
diff
changeset
|
124 |
} else { |
dd6c58eeb05c
8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents:
18241
diff
changeset
|
125 |
return 0L; |
dd6c58eeb05c
8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents:
18241
diff
changeset
|
126 |
} |
12047 | 127 |
} |
37686
1ad88c2dfacd
8147841: [macosx] Updating TrayIcons popup menu does not work on Mac OS X
psadhukhan
parents:
35657
diff
changeset
|
128 |
|
43204 | 129 |
// This method is executed on Appkit, so if ptr is not zero means that, |
130 |
// it is still not deallocated(even if we call NSApp postRunnableEvent) |
|
131 |
// and sent CFRelease to the native queue |
|
132 |
return checkAndCreatePopupPeer().ptr; |
|
12047 | 133 |
} |
134 |
||
135 |
/** |
|
136 |
* We display tray icon message as a small dialog with OK button. |
|
137 |
* This is lame, but JDK 1.6 does basically the same. There is a new |
|
138 |
* kind of window in Lion, NSPopover, so perhaps it could be used it |
|
139 |
* to implement better looking notifications. |
|
140 |
*/ |
|
141 |
public void displayMessage(final String caption, final String text, |
|
142 |
final String messageType) { |
|
47508
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
143 |
// obtain icon to show along the message |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
144 |
Icon icon = getIconForMessageType(messageType); |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
145 |
CImage cimage = null; |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
146 |
if (icon != null) { |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
147 |
BufferedImage image = scaleIcon(icon, 0.75); |
50649
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
148 |
cimage = CImage.getCreator().createFromImage(image, null); |
47508
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
149 |
} |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
150 |
if (cimage != null) { |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
151 |
cimage.execute(imagePtr -> { |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
152 |
execute(ptr -> nativeShowNotification(ptr, caption, text, |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
153 |
imagePtr)); |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
154 |
}); |
12047 | 155 |
} else { |
47508
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
156 |
execute(ptr -> nativeShowNotification(ptr, caption, text, 0)); |
12047 | 157 |
} |
158 |
} |
|
159 |
||
160 |
@Override |
|
161 |
public void dispose() { |
|
14157
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
162 |
dummyFrame.dispose(); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
163 |
|
23247
dd6c58eeb05c
8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents:
18241
diff
changeset
|
164 |
if (popup != null) { |
dd6c58eeb05c
8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents:
18241
diff
changeset
|
165 |
popup.removeNotify(); |
dd6c58eeb05c
8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents:
18241
diff
changeset
|
166 |
} |
dd6c58eeb05c
8007220: [macosx] Setting popupmenu on TrayIcon do not work if done *after* adding TrayIcon
pchelko
parents:
18241
diff
changeset
|
167 |
|
12047 | 168 |
LWCToolkit.targetDisposedPeer(target, this); |
169 |
target = null; |
|
170 |
||
171 |
super.dispose(); |
|
172 |
} |
|
173 |
||
174 |
@Override |
|
175 |
public void setToolTip(String tooltip) { |
|
44752 | 176 |
execute(ptr -> nativeSetToolTip(ptr, tooltip)); |
12047 | 177 |
} |
178 |
||
179 |
//adds tooltip to the NSStatusBar's NSButton. |
|
180 |
private native void nativeSetToolTip(long trayIconModel, String tooltip); |
|
181 |
||
182 |
@Override |
|
183 |
public void showPopupMenu(int x, int y) { |
|
184 |
//Not used. The popupmenu is shown from the native code. |
|
185 |
} |
|
186 |
||
187 |
@Override |
|
188 |
public void updateImage() { |
|
50649
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
189 |
|
12047 | 190 |
Image image = target.getImage(); |
50649
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
191 |
if (image != null) { |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
192 |
updateNativeImage(image); |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
193 |
} |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
194 |
} |
12047 | 195 |
|
50649
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
196 |
void updateNativeImage(Image image) { |
12047 | 197 |
MediaTracker tracker = new MediaTracker(new Button("")); |
198 |
tracker.addImage(image, 0); |
|
199 |
try { |
|
200 |
tracker.waitForAll(); |
|
201 |
} catch (InterruptedException ignore) { } |
|
202 |
||
203 |
if (image.getWidth(null) <= 0 || |
|
204 |
image.getHeight(null) <= 0) |
|
205 |
{ |
|
206 |
return; |
|
207 |
} |
|
208 |
||
50649
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
209 |
CImage cimage = CImage.getCreator().createFromImage(image, observer); |
44752 | 210 |
boolean imageAutoSize = target.isImageAutoSize(); |
53794
c2b366b9c360
8207938: At step6,Click Add button,case failed automatically.
mhalder
parents:
50649
diff
changeset
|
211 |
if (cimage != null) { |
c2b366b9c360
8207938: At step6,Click Add button,case failed automatically.
mhalder
parents:
50649
diff
changeset
|
212 |
cimage.execute(imagePtr -> { |
c2b366b9c360
8207938: At step6,Click Add button,case failed automatically.
mhalder
parents:
50649
diff
changeset
|
213 |
execute(ptr -> { |
c2b366b9c360
8207938: At step6,Click Add button,case failed automatically.
mhalder
parents:
50649
diff
changeset
|
214 |
setNativeImage(ptr, imagePtr, imageAutoSize); |
c2b366b9c360
8207938: At step6,Click Add button,case failed automatically.
mhalder
parents:
50649
diff
changeset
|
215 |
}); |
44752 | 216 |
}); |
53794
c2b366b9c360
8207938: At step6,Click Add button,case failed automatically.
mhalder
parents:
50649
diff
changeset
|
217 |
} |
12047 | 218 |
} |
219 |
||
220 |
private native void setNativeImage(final long model, final long nsimage, final boolean autosize); |
|
221 |
||
14157
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
222 |
private void postEvent(final AWTEvent event) { |
12047 | 223 |
SunToolkit.executeOnEventHandlerThread(target, new Runnable() { |
224 |
public void run() { |
|
225 |
SunToolkit.postEvent(SunToolkit.targetToAppContext(target), event); |
|
226 |
} |
|
227 |
}); |
|
228 |
} |
|
229 |
||
14157
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
230 |
//invocation from the AWTTrayIcon.m |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
231 |
private void handleMouseEvent(NSEvent nsEvent) { |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
232 |
int buttonNumber = nsEvent.getButtonNumber(); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
233 |
final SunToolkit tk = (SunToolkit)Toolkit.getDefaultToolkit(); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
234 |
if ((buttonNumber > 2 && !tk.areExtraMouseButtonsEnabled()) |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
235 |
|| buttonNumber > tk.getNumberOfButtons() - 1) { |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
236 |
return; |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
237 |
} |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
238 |
|
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
239 |
int jeventType = NSEvent.nsToJavaEventType(nsEvent.getType()); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
240 |
|
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
241 |
int jbuttonNumber = MouseEvent.NOBUTTON; |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
242 |
int jclickCount = 0; |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
243 |
if (jeventType != MouseEvent.MOUSE_MOVED) { |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
244 |
jbuttonNumber = NSEvent.nsToJavaButton(buttonNumber); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
245 |
jclickCount = nsEvent.getClickCount(); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
246 |
} |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
247 |
|
35657
5ee7a31d7923
8143054: [macosx] KeyEvent modifiers do not contain information about mouse buttons
serb
parents:
30469
diff
changeset
|
248 |
int jmodifiers = NSEvent.nsToJavaModifiers( |
14157
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
249 |
nsEvent.getModifierFlags()); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
250 |
boolean isPopupTrigger = NSEvent.isPopupTrigger(jmodifiers); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
251 |
|
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
252 |
int eventButtonMask = (jbuttonNumber > 0)? |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
253 |
MouseEvent.getMaskForButton(jbuttonNumber) : 0; |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
254 |
long when = System.currentTimeMillis(); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
255 |
|
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
256 |
if (jeventType == MouseEvent.MOUSE_PRESSED) { |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
257 |
mouseClickButtons |= eventButtonMask; |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
258 |
} else if (jeventType == MouseEvent.MOUSE_DRAGGED) { |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
259 |
mouseClickButtons = 0; |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
260 |
} |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
261 |
|
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
262 |
// The MouseEvent's coordinates are relative to screen |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
263 |
int absX = nsEvent.getAbsX(); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
264 |
int absY = nsEvent.getAbsY(); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
265 |
|
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
266 |
MouseEvent mouseEvent = new MouseEvent(dummyFrame, jeventType, when, |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
267 |
jmodifiers, absX, absY, absX, absY, jclickCount, isPopupTrigger, |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
268 |
jbuttonNumber); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
269 |
mouseEvent.setSource(target); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
270 |
postEvent(mouseEvent); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
271 |
|
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
272 |
// fire ACTION event |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
273 |
if (jeventType == MouseEvent.MOUSE_PRESSED && isPopupTrigger) { |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
274 |
final String cmd = target.getActionCommand(); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
275 |
final ActionEvent event = new ActionEvent(target, |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
276 |
ActionEvent.ACTION_PERFORMED, cmd); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
277 |
postEvent(event); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
278 |
} |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
279 |
|
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
280 |
// synthesize CLICKED event |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
281 |
if (jeventType == MouseEvent.MOUSE_RELEASED) { |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
282 |
if ((mouseClickButtons & eventButtonMask) != 0) { |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
283 |
MouseEvent clickEvent = new MouseEvent(dummyFrame, |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
284 |
MouseEvent.MOUSE_CLICKED, when, jmodifiers, absX, absY, |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
285 |
absX, absY, jclickCount, isPopupTrigger, jbuttonNumber); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
286 |
clickEvent.setSource(target); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
287 |
postEvent(clickEvent); |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
288 |
} |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
289 |
|
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
290 |
mouseClickButtons &= ~eventButtonMask; |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
291 |
} |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
292 |
} |
5d50d32dd770
7124321: [macosx] TrayIcon MouseListener is never triggered
leonidr
parents:
12047
diff
changeset
|
293 |
|
47508
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
294 |
private native void nativeShowNotification(long trayIconModel, |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
295 |
String caption, String text, |
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
296 |
long nsimage); |
12047 | 297 |
|
298 |
/** |
|
47508
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
299 |
* Used by the automated tests. |
12047 | 300 |
*/ |
47508
33da1153954c
8187639: TrayIcon is not properly supported on macOS in multi-screen environment
serb
parents:
47216
diff
changeset
|
301 |
private native Point2D nativeGetIconLocation(long trayIconModel); |
12047 | 302 |
|
303 |
/** |
|
304 |
* Scales an icon using specified scale factor |
|
305 |
* |
|
306 |
* @param icon icon to scale |
|
307 |
* @param scaleFactor scale factor to use |
|
308 |
* @return scaled icon as BuffedredImage |
|
309 |
*/ |
|
310 |
private static BufferedImage scaleIcon(Icon icon, double scaleFactor) { |
|
311 |
if (icon == null) { |
|
312 |
return null; |
|
313 |
} |
|
314 |
||
315 |
int w = icon.getIconWidth(); |
|
316 |
int h = icon.getIconHeight(); |
|
317 |
||
318 |
GraphicsEnvironment ge = |
|
319 |
GraphicsEnvironment.getLocalGraphicsEnvironment(); |
|
320 |
GraphicsDevice gd = ge.getDefaultScreenDevice(); |
|
321 |
GraphicsConfiguration gc = gd.getDefaultConfiguration(); |
|
322 |
||
323 |
// convert icon into image |
|
324 |
BufferedImage iconImage = gc.createCompatibleImage(w, h, |
|
325 |
Transparency.TRANSLUCENT); |
|
326 |
Graphics2D g = iconImage.createGraphics(); |
|
327 |
icon.paintIcon(null, g, 0, 0); |
|
328 |
g.dispose(); |
|
329 |
||
330 |
// and scale it nicely |
|
331 |
int scaledW = (int) (w * scaleFactor); |
|
332 |
int scaledH = (int) (h * scaleFactor); |
|
333 |
BufferedImage scaledImage = gc.createCompatibleImage(scaledW, scaledH, |
|
334 |
Transparency.TRANSLUCENT); |
|
335 |
g = scaledImage.createGraphics(); |
|
336 |
g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, |
|
337 |
RenderingHints.VALUE_INTERPOLATION_BILINEAR); |
|
338 |
g.drawImage(iconImage, 0, 0, scaledW, scaledH, null); |
|
339 |
g.dispose(); |
|
340 |
||
341 |
return scaledImage; |
|
342 |
} |
|
343 |
||
344 |
||
345 |
/** |
|
346 |
* Gets Aqua icon used in message dialog. |
|
347 |
*/ |
|
348 |
private static Icon getIconForMessageType(String messageType) { |
|
349 |
if (messageType.equals("ERROR")) { |
|
350 |
return UIManager.getIcon("OptionPane.errorIcon"); |
|
351 |
} else if (messageType.equals("WARNING")) { |
|
352 |
return UIManager.getIcon("OptionPane.warningIcon"); |
|
353 |
} else { |
|
354 |
// this is just an application icon |
|
355 |
return UIManager.getIcon("OptionPane.informationIcon"); |
|
356 |
} |
|
357 |
} |
|
50649
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
358 |
|
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
359 |
class IconObserver implements ImageObserver { |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
360 |
@Override |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
361 |
public boolean imageUpdate(Image image, int flags, int x, int y, int width, int height) { |
53794
c2b366b9c360
8207938: At step6,Click Add button,case failed automatically.
mhalder
parents:
50649
diff
changeset
|
362 |
if (target == null || image != target.getImage()) //if the image has been changed |
50649
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
363 |
{ |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
364 |
return false; |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
365 |
} |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
366 |
if ((flags & (ImageObserver.FRAMEBITS | ImageObserver.ALLBITS | |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
367 |
ImageObserver.WIDTH | ImageObserver.HEIGHT)) != 0) |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
368 |
{ |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
369 |
SunToolkit.executeOnEventHandlerThread(target, new Runnable() { |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
370 |
public void run() { |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
371 |
updateNativeImage(image); |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
372 |
} |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
373 |
}); |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
374 |
} |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
375 |
return (flags & ImageObserver.ALLBITS) == 0; |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
376 |
} |
9cf90ac8dbf7
8029250: [macosx] There is no tray icon shown in the system tray area when case starts
mhalder
parents:
47508
diff
changeset
|
377 |
} |
12047 | 378 |
} |
379 |