![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 134.0.6948.0 * chore: update can_create_window.patch https://chromium-review.googlesource.com/c/chromium/src/+/6151982 no patch code changes, but had to manually apply due to upstream context shear * chore: update proxy_config_monitor.patch no manual changes; patch applied with fuzz 2 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6126219 * chore: update build_add_electron_tracing_category.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6149256 * chore: update adjust_accessibility_ui_for_electron.patch https://chromium-review.googlesource.com/c/chromium/src/+/6105650 no patch code changes, but had to manually apply due to upstream context shear * chore: e patches all * chore: use fully-qualified path for all.gn Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6154997 * chore: do not use a variable when assigning rtc_use_h264 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6154997 * Move GlobalShortcutListenerLinux to //ui/base Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6097375 * [MPArch Guest View] Make WebPreferences queried per frame tree root Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6096390 * [Status Icons] Allow vector resources https://chromium-review.googlesource.com/c/chromium/src/+/6139403 * [Extensions] Move MatchOriginAsFallbackBehavior to Mojom Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6141793 * Remove StrongAlias::Hasher Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6132291 * Rename text-change and select-change methods and related stuff Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6148816 * [Code Health] Remove stale feature EnableWebUsbOnExtensionServiceWorker https://chromium-review.googlesource.com/c/chromium/src/+/6115161 * [Extensions Cleanup] Move creation of tab-based ports to factory method https://chromium-review.googlesource.com/c/chromium/src/+/6143725 * refactor: add StatusIconGtk::SetIcon() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6139403 copied from chrome/browser/status_icons/status_icon.cc * refactor: add TrayIconLinux::GetIcon() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6139403 * chore: update feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch remove unused filter_ field * chore: bump chromium in DEPS to 134.0.6950.0 * chore: bump chromium in DEPS to 134.0.6952.0 * chore: bump chromium in DEPS to 134.0.6954.0 * chore: bump chromium in DEPS to 134.0.6956.0 * chore: update Chromium patches * 6165749: Check scanout support in RenderableGpuMemoryBufferPool | https://chromium-review.googlesource.com/c/chromium/src/+/6165749 * 6106730: [Win] Use DXGI swapchains and DCOMP visuals in software mode | https://chromium-review.googlesource.com/c/chromium/src/+/6106730 * chore: update patches * chore: bump chromium in DEPS to 134.0.6958.0 * chore: bump chromium in DEPS to 134.0.6960.0 * chore: update chromium patches * 6168371: Remove extensions GlobalShortcutListener wrapper | https://chromium-review.googlesource.com/c/chromium/src/+/6168371 * chore: update patches * 6161637: WebUI: Leverage build_webui() in chrome://translate-internals | https://chromium-review.googlesource.com/c/chromium/src/+/6161637 * chore: bump chromium in DEPS to 134.0.6962.0 * 6177329: Remove policy.used_policy_certificates pref on ChromeOS | https://chromium-review.googlesource.com/c/chromium/src/+/6177329 * 6180524: Simplify logic in components/os_crypt/sync/BUILD.gn | https://chromium-review.googlesource.com/c/chromium/src/+/6180524 * 6144831: Enforce --disallow-v8-feature-flag-overrides in the renderer | https://chromium-review.googlesource.com/c/chromium/src/+/6144831 * chore: update patches * chore: bump chromium in DEPS to 134.0.6964.0 * 6181010: Ensure busy cursor does not show via LaunchWithoutSandbox | https://chromium-review.googlesource.com/c/chromium/src/+/6181010 * chore: update patches * chore: bump chromium in DEPS to 134.0.6966.0 * 6180598: [api] Remove Reallocate | https://chromium-review.googlesource.com/c/v8/v8/+/6180598 * 6170781: [Refactor] Move UninstallExtension to ExtensionRegistrar. | https://chromium-review.googlesource.com/c/chromium/src/+/6170781 * chore: update filenames.libcxx.gni * 6168207: cdm: Remove widevine_cdm_version.h | https://chromium-review.googlesource.com/c/chromium/src/+/6168207 * chore: bump chromium in DEPS to 134.0.6968.0 * 6030552: [macOS] Allow using vibrancy with NativeWidgetNSWindowBridge | https://chromium-review.googlesource.com/c/chromium/src/+/6030552 * fix: use explicit copy to replace realloc impl https://chromium-review.googlesource.com/c/v8/v8/+/6180598 https://issues.chromium.org/issues/331326406 As per recommendation, "File an issue with Node to explicitly copy,because they copy under the hood anyway" * fixup! 6106730: [Win] Use DXGI swapchains and DCOMP visuals in software mode | https://chromium-review.googlesource.com/c/chromium/src/+/6106730 * fix: undefine win32 StrCat https://chromium-review.googlesource.com/c/chromium/src/+/6172292 * fix: //device/vr:directx_helpers breaking the build https://chromium-review.googlesource.com/c/chromium/src/+/6064548 Upstreamed in https://chromium-review.googlesource.com/c/chromium/src/+/6186102 * fix: avoid calling ui::Layer::SetFillsBoundsOpaquely https://chromium-review.googlesource.com/c/chromium/src/+/6175787 The layer opacity is determined by the background color's alpha value * fix: build with proprietary_codecs The explicit setting of rtc_use_h264 is no longer needed since https://webrtc-review.googlesource.com/c/src/+/62380 * fix: increase empty trace file size threshold https://chromium-review.googlesource.com/c/chromium/src/+/6176642 Traces now contain a net-constants property to allow them to be converted to a net log. These contain ~1240 new properties with formatted JSON data. * fix: node tests missing resource management globals https://chromium-review.googlesource.com/c/chromium/src/+/6174695 * fixup! fix: use explicit copy to replace realloc impl * chore: disable focus handling test due to win32/ia32 regression --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org>
119 lines
3.2 KiB
C++
119 lines
3.2 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/tray_icon_linux.h"
|
|
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h"
|
|
#include "shell/browser/ui/status_icon_gtk.h"
|
|
#include "ui/gfx/image/image_skia_rep.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
gfx::ImageSkia GetBestImageRep(const gfx::ImageSkia& image) {
|
|
image.EnsureRepsForSupportedScales();
|
|
float best_scale = 0.0f;
|
|
SkBitmap best_rep;
|
|
for (const auto& rep : image.image_reps()) {
|
|
if (rep.scale() > best_scale) {
|
|
best_scale = rep.scale();
|
|
best_rep = rep.GetBitmap();
|
|
}
|
|
}
|
|
// All status icon implementations want the image in pixel coordinates, so use
|
|
// a scale factor of 1.
|
|
return gfx::ImageSkia::CreateFromBitmap(best_rep, 1.0f);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TrayIconLinux::TrayIconLinux()
|
|
: status_icon_dbus_(new StatusIconLinuxDbus),
|
|
status_icon_type_(StatusIconType::kDbus) {
|
|
status_icon_dbus_->SetDelegate(this);
|
|
}
|
|
|
|
TrayIconLinux::~TrayIconLinux() = default;
|
|
|
|
void TrayIconLinux::SetImage(const gfx::Image& image) {
|
|
image_ = GetBestImageRep(image.AsImageSkia());
|
|
if (auto* status_icon = GetStatusIcon())
|
|
status_icon->SetImage(image_);
|
|
}
|
|
|
|
void TrayIconLinux::SetToolTip(const std::string& tool_tip) {
|
|
tool_tip_ = base::UTF8ToUTF16(tool_tip);
|
|
if (auto* status_icon = GetStatusIcon())
|
|
status_icon->SetToolTip(tool_tip_);
|
|
}
|
|
|
|
void TrayIconLinux::SetContextMenu(raw_ptr<ElectronMenuModel> menu_model) {
|
|
menu_model_ = menu_model;
|
|
if (auto* status_icon = GetStatusIcon())
|
|
status_icon->UpdatePlatformContextMenu(menu_model_);
|
|
}
|
|
|
|
const gfx::ImageSkia& TrayIconLinux::GetImage() const {
|
|
return image_;
|
|
}
|
|
|
|
const gfx::VectorIcon* TrayIconLinux::GetIcon() const {
|
|
return nullptr;
|
|
}
|
|
|
|
const std::u16string& TrayIconLinux::GetToolTip() const {
|
|
return tool_tip_;
|
|
}
|
|
|
|
ui::MenuModel* TrayIconLinux::GetMenuModel() const {
|
|
return menu_model_;
|
|
}
|
|
|
|
void TrayIconLinux::OnImplInitializationFailed() {
|
|
switch (status_icon_type_) {
|
|
case StatusIconType::kDbus:
|
|
status_icon_dbus_.reset();
|
|
status_icon_gtk_ = std::make_unique<StatusIconGtk>();
|
|
status_icon_type_ = StatusIconType::kGtk;
|
|
status_icon_gtk_->SetDelegate(this);
|
|
return;
|
|
case StatusIconType::kGtk:
|
|
status_icon_gtk_.reset();
|
|
status_icon_type_ = StatusIconType::kNone;
|
|
menu_model_ = nullptr;
|
|
return;
|
|
case StatusIconType::kNone:
|
|
NOTREACHED();
|
|
}
|
|
}
|
|
|
|
void TrayIconLinux::OnClick() {
|
|
NotifyClicked();
|
|
}
|
|
|
|
bool TrayIconLinux::HasClickAction() {
|
|
// Returning true will make the tooltip show as an additional context menu
|
|
// item, which makes sense in Chrome but not in most Electron apps.
|
|
return false;
|
|
}
|
|
|
|
ui::StatusIconLinux* TrayIconLinux::GetStatusIcon() {
|
|
switch (status_icon_type_) {
|
|
case StatusIconType::kDbus:
|
|
return status_icon_dbus_.get();
|
|
case StatusIconType::kGtk:
|
|
return status_icon_gtk_.get();
|
|
case StatusIconType::kNone:
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
// static
|
|
TrayIcon* TrayIcon::Create(std::optional<UUID> guid) {
|
|
return new TrayIconLinux;
|
|
}
|
|
|
|
} // namespace electron
|