Commit graph

61 commits

Author SHA1 Message Date
Kevin Sawicki
6285500cdc Sort includes alphabetically 2016-08-26 15:30:02 -07:00
Cheng Zhao
b57665330c Merge branch 'master' into chrome52 2016-07-21 05:34:36 -06:00
Kevin Sawicki
2faf00dc19 Only use default accelerator in Windows/Linux app menu 2016-07-07 11:50:19 -07:00
Cheng Zhao
381689d3ed Fix building on Windows 2016-07-05 09:31:29 +09:00
Cheng Zhao
1ba3907038 Update to API changes of Chrome 52 2016-07-04 15:32:43 +09:00
Kevin Sawicki
45dbbfdfe9 Use nullptr comparisons 2016-06-29 11:52:58 -07:00
Kevin Sawicki
e797eb5ca3 Use set context menu when param is not specified 2016-06-29 11:52:58 -07:00
Cheng Zhao
324153d394 win: Use DIP rect for tray icon's bounds 2016-06-21 16:05:28 +09:00
Cheng Zhao
886ef1717c win: Implement tray.getBounds() API 2016-06-21 15:49:22 +09:00
Cheng Zhao
3182485e68 No need to reference the icon in Tray 2016-05-20 22:44:02 +09:00
Cheng Zhao
9e26e5c121 Load HICON directly in NotifyIcon 2016-05-20 16:55:22 +09:00
Brian R. Bondy
732936713a GetNativeScreen -> GetScreen 2016-05-13 11:07:17 +09:00
Paul Betts
12e9b7ab88 Use assignment operator since both sides are scoped now 2016-03-10 17:06:22 +09:00
Paul Betts
60a2495b30 Update Get() => get(), Set() => reset() 2016-03-10 17:06:22 +09:00
Cheng Zhao
615ce45849 win: Implement menu parameter 2015-12-02 19:58:10 +08:00
Cheng Zhao
2fba05b5e7 Add menu parameter for Tray.popUpContextMenu 2015-12-02 18:43:11 +08:00
mgarciaisaia
4013b652ff 🏁🐛 Buffer overflows in tooltips
Fixes #3290.
2015-11-04 15:34:58 +08:00
Cheng Zhao
9b1fa04988 win: Fix building 2015-09-24 12:01:57 +08:00
Paul Betts
b0e5039951 Fix initializer 2015-09-23 11:26:57 -07:00
Paul Betts
22e6f15795 Remove GUID from Shell_NotifyIcon calls
https://github.com/atom/electron/issues/2468#issuecomment-142684129 has
the details
2015-09-23 11:20:26 -07:00
Paul Betts
0efdb448b6 Merge pull request #2509 from atom/fix-win-tray
Correct generation of GUID on Windows.
2015-08-17 09:02:21 -07:00
Haojian Wu
763dcc545d Correct generation of GUID on Windows. 2015-08-17 13:20:36 +08:00
Cheng Zhao
33eadad139 popContextMenu => popUpContextMenu 2015-08-10 13:00:15 +08:00
Cheng Zhao
225140bd64 win: Don't emit right-clicked event when there is menu attached 2015-08-10 12:52:55 +08:00
Haojian Wu
613e5c77ea Check context menu when calling popContextMenu API. 2015-08-04 19:45:44 +08:00
Cheng Zhao
d42fd6fc7e win: Pass modifers in 'clicked' events 2015-07-29 13:10:51 +08:00
Cheng Zhao
74248253f5 win: Set GUID when getting icon's bounds 2015-07-29 12:55:44 +08:00
Cheng Zhao
9afa94f4b8 win: Implement double-clicked event 2015-07-29 12:36:01 +08:00
Cheng Zhao
b08af89473 Style fix for #2328 2015-07-29 11:22:12 +08:00
Paul Betts
5e61974c24 Set NIF_GUID if we have a GUID 2015-07-24 08:05:36 -07:00
Paul Betts
70feb08f84 Fix linting issues 2015-07-24 03:30:23 -07:00
Paul Betts
75b08f510e Fix up namespaces 2015-07-24 03:27:15 -07:00
Paul Betts
08383a69ce Propagate User App Model ID to Tray Icon
This PR prevents dozens of items showing up in the notification area
preferences when using Squirrel for Windows, by ensuring that
notification tray items are tied to the User App Model ID.
2015-07-24 03:10:03 -07:00
Haojian Wu
ed4c69343f Add 'tray.popContextMenu()' Windows implementation. 2015-07-16 11:42:43 +08:00
Haojian Wu
5ad3fff6a0 Implement 'right-clicked' tray event on Windows. 2015-07-15 20:03:05 +08:00
Seppe Stas
cac97cca0d Initialized rect with zeros
As per @zcbenz 's remark: The rect should be initialized with zeros to prevent random values being passed to the click event handler when `Shell_NotifyIconGetRect` fails.
2015-06-08 19:07:46 +02:00
Seppe Stas
16c08e7e37 Switched to gfx::Rect constructor that takes a RECT
As per @zcbenz's suggestion the rect passed to the click event handler now passes a rect constructed using `gfx::Rect(const RECT& r)`.
2015-06-08 19:04:56 +02:00
Seppe Stas
e5c4e34ac4 Ow 💩, where did that extra space come from? 2015-06-03 07:54:38 +02:00
Seppe Stas
ce8aa073ee Added bounds payload to tray clicked event
Used [Shell_NotifyIconGetRect function](https://msdn.microsoft.com/en-us/library/windows/desktop/dd378426) to get the bounds of the application's tray icon.
Note: only works with Windows 7 and later.

Related to #1159, #1500.
2015-06-02 21:43:37 +02:00
Cheng Zhao
a53b1f7edf win: Mouse position is not notify icon's position 2015-05-04 11:37:23 +08:00
deepak1556
6d7d068e49 tray: send tray icon position as payload onclick OSX 2015-05-01 19:30:01 +05:30
Cheng Zhao
819ab5cd0c Fix ui/gfx/geometry headers 2015-03-18 09:57:38 +08:00
Cheng Zhao
bf14f67cb8 win: Fix building 2015-01-02 19:31:19 -08:00
Cheng Zhao
ab83b21fa6 Use gfx::Image instead of gfx::ImageSkia in API
The gfx::Image can use NSImage directly as underlying format, so we
don't have to decode images ourselves on Mac, and we will also be able
to make use of template images.
2015-01-02 18:43:56 -08:00
Cheng Zhao
9f99209733 win: Add "balloon-show" and "balloon-closed" events 2014-11-28 19:42:57 +08:00
Cheng Zhao
a3327ac53e win: Remove XP code in Tray 2014-11-28 18:59:51 +08:00
Cheng Zhao
210c97f957 win: Add "balloon-clicked" event for Tray 2014-11-28 18:50:31 +08:00
Cheng Zhao
2650e34867 win: Add NotifyIcon::DisplayBalloon 2014-11-28 18:30:43 +08:00
Cheng Zhao
89de5b6e9a win: Remove NotifyIconHostStateChanger
We don't need the ability it provided, and it is causing crashes on some
machines.

Fixes #850.
2014-11-28 17:47:47 +08:00
Kevin Sawicki
b6b6fc3bfd Remove All Rights Reserved after GitHub copyright
Closes #762
2014-10-31 11:17:05 -07:00