mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

linux: GTK+ status icon has come back

Browse source
This commit is contained in:
Cheng Zhao 2014-12-09 16:51:27 -08:00
parent e58b3ddc86
commit 22c4911b58
9 changed files with 4 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/ui/tray_icon.cc
View file

@ -12,6 +12,9 @@ TrayIcon::TrayIcon() {
TrayIcon::~TrayIcon() {
}
void TrayIcon::SetPressedImage(const gfx::ImageSkia& image) {
}
void TrayIcon::SetTitle(const std::string& title) {
}

2
atom/browser/ui/tray_icon.h
View file

@ -23,7 +23,7 @@ class TrayIcon {
virtual void SetImage(const gfx::ImageSkia& image) = 0;
// Sets the image associated with this status icon when pressed.
virtual void SetPressedImage(const gfx::ImageSkia& image) = 0;
virtual void SetPressedImage(const gfx::ImageSkia& image);
// Sets the hover text for this status icon. This is also used as the label
// for the menu item which is created as a replacement for the status icon

4
atom/browser/ui/tray_icon_gtk.cc
View file

@ -32,10 +32,6 @@ void TrayIconGtk::SetImage(const gfx::ImageSkia& image) {
icon_->set_delegate(this);
}
void TrayIconGtk::SetPressedImage(const gfx::ImageSkia& image) {
icon_->SetPressedImage(image);
}
void TrayIconGtk::SetToolTip(const std::string& tool_tip) {
icon_->SetToolTip(base::UTF8ToUTF16(tool_tip));
}

1
atom/browser/ui/tray_icon_gtk.h
View file

@ -24,7 +24,6 @@ class TrayIconGtk : public TrayIcon,
// TrayIcon:
virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE;
virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE;
virtual void SetToolTip(const std::string& tool_tip) OVERRIDE;
virtual void SetContextMenu(ui::SimpleMenuModel* menu_model) OVERRIDE;