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

fix: reimplement Tray with StatusIconLinuxDbus on Linux (#36333)

Browse source
This commit is contained in:
Cheng Zhao 2022-11-29 04:36:25 +09:00 • committed by GitHub
parent bbb590b777
commit 16a7bd7102
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 126 additions and 948 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shell/browser/ui/tray_icon_gtk.h
View file

@ -11,6 +11,8 @@
#include "shell/browser/ui/tray_icon.h"
#include "ui/linux/status_icon_linux.h"
class StatusIconLinuxDbus;
namespace electron {
class TrayIconGtk : public TrayIcon, public ui::StatusIconLinux::Delegate {
@ -34,10 +36,17 @@ class TrayIconGtk : public TrayIcon, public ui::StatusIconLinux::Delegate {
void OnImplInitializationFailed() override;
private:
std::unique_ptr<ui::StatusIconLinux> icon_;
enum StatusIconType {
kTypeDbus,
kTypeNone,
};
scoped_refptr<StatusIconLinuxDbus> status_icon_;
StatusIconType status_icon_type_;
gfx::ImageSkia image_;
std::u16string tool_tip_;
ui::MenuModel* menu_model_;
raw_ptr<ui::MenuModel> menu_model_ = nullptr;
};
} // namespace electron