Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add tray.removeBalloon() #19547

Merged
merged 1 commit into from Aug 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/api/tray.md
Expand Up @@ -261,6 +261,10 @@ Returns `Boolean` - Whether double click events will be ignored.

Displays a tray balloon.

#### `tray.removeBalloon()` _Windows_

Removes a tray balloon.

#### `tray.popUpContextMenu([menu, position])` _macOS_ _Windows_

* `menu` Menu (optional)
Expand Down
5 changes: 5 additions & 0 deletions shell/browser/api/atom_api_tray.cc
Expand Up @@ -207,6 +207,10 @@ void Tray::DisplayBalloon(mate::Arguments* args,
#endif
}

void Tray::RemoveBalloon() {
tray_icon_->RemoveBalloon();
}

void Tray::PopUpContextMenu(mate::Arguments* args) {
mate::Handle<Menu> menu;
args->GetNext(&menu);
Expand Down Expand Up @@ -241,6 +245,7 @@ void Tray::BuildPrototype(v8::Isolate* isolate,
.SetMethod("getIgnoreDoubleClickEvents",
&Tray::GetIgnoreDoubleClickEvents)
.SetMethod("displayBalloon", &Tray::DisplayBalloon)
.SetMethod("removeBalloon", &Tray::RemoveBalloon)
.SetMethod("popUpContextMenu", &Tray::PopUpContextMenu)
.SetMethod("setContextMenu", &Tray::SetContextMenu)
.SetMethod("getBounds", &Tray::GetBounds);
Expand Down
1 change: 1 addition & 0 deletions shell/browser/api/atom_api_tray.h
Expand Up @@ -74,6 +74,7 @@ class Tray : public mate::TrackableObject<Tray>, public TrayIconObserver {
void SetIgnoreDoubleClickEvents(bool ignore);
bool GetIgnoreDoubleClickEvents();
void DisplayBalloon(mate::Arguments* args, const mate::Dictionary& options);
void RemoveBalloon();
void PopUpContextMenu(mate::Arguments* args);
void SetContextMenu(v8::Isolate* isolate, mate::Handle<Menu> menu);
gfx::Rect GetBounds();
Expand Down
2 changes: 2 additions & 0 deletions shell/browser/ui/tray_icon.cc
Expand Up @@ -18,6 +18,8 @@ void TrayIcon::DisplayBalloon(ImageType icon,
const base::string16& title,
const base::string16& contents) {}

void TrayIcon::RemoveBalloon() {}

void TrayIcon::PopUpContextMenu(const gfx::Point& pos,
AtomMenuModel* menu_model) {}

Expand Down
3 changes: 3 additions & 0 deletions shell/browser/ui/tray_icon.h
Expand Up @@ -63,6 +63,9 @@ class TrayIcon {
const base::string16& title,
const base::string16& contents);

// Removes the notification balloon.
virtual void RemoveBalloon();

// Popups the menu.
virtual void PopUpContextMenu(const gfx::Point& pos,
AtomMenuModel* menu_model);
Expand Down
10 changes: 10 additions & 0 deletions shell/browser/ui/win/notify_icon.cc
Expand Up @@ -138,6 +138,16 @@ void NotifyIcon::DisplayBalloon(HICON icon,
LOG(WARNING) << "Unable to create status tray balloon.";
}

void NotifyIcon::RemoveBalloon() {
NOTIFYICONDATA icon_data;
InitIconData(&icon_data);
icon_data.uFlags |= NIF_INFO;

BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
if (!result)
LOG(WARNING) << "Unable to remove status tray balloon.";
codebytere marked this conversation as resolved.
Show resolved Hide resolved
}

void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
AtomMenuModel* menu_model) {
// Returns if context menu isn't set.
Expand Down
1 change: 1 addition & 0 deletions shell/browser/ui/win/notify_icon.h
Expand Up @@ -61,6 +61,7 @@ class NotifyIcon : public TrayIcon {
void DisplayBalloon(HICON icon,
const base::string16& title,
const base::string16& contents) override;
void RemoveBalloon() override;
void PopUpContextMenu(const gfx::Point& pos,
AtomMenuModel* menu_model) override;
void SetContextMenu(AtomMenuModel* menu_model) override;
Expand Down