![Electron Bot](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 91.0.4435.3 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 * chore: update patches * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 * chore: update patches * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 * chore: remove deleted file from chromium_src list * chore: fix lint * update patches * chore: bump chromium in DEPS to 91.0.4438.0 * chore: bump chromium in DEPS to 91.0.4439.0 * chore: bump chromium in DEPS to 91.0.4440.0 * chore: bump chromium in DEPS to 91.0.4441.0 * chore: bump chromium in DEPS to 91.0.4442.0 * chore: bump chromium in DEPS to 91.0.4443.0 * chore: bump chromium in DEPS to 91.0.4445.0 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: update patches * fixup gn check * Merge branch 'master' into roller/chromium/master * update to xcode 12.4.0 Needed because of8008deb41c
* 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 * chore: bump chromium in DEPS to 91.0.4448.0 * Update patches * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * only include mac notifications on mac * add additional skipping of atk toolchain check * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 * Fixup 2721718: Move HostID to extensions::mojom::HostID * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() * update node headers * chore: bump chromium in DEPS to 91.0.4449.0 * Revert "chore: bump chromium in DEPS to 91.0.4449.0" This reverts commitbccafa0289
. * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build * fix StrCat issue * incantations for WebContentsPreferences::GetPreloadPath wide strings * bump nan * fix GetAsString maybe? * windows build fixes * more windows build fix * SetAppUserModelID -> wstring * upgrade nan dep in tests * lint * wstrings are cross-platform * linter * only bind setAppUserModelId on windows * fix a messed up merge * well that was an odyssey * backport fcdf35e from v8 to fix nan crash * disable typedarrays-test.js * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 * use PartitionAllocator for ArrayBuffers in the main process * fix patches * chore: omit some unnecessary conversions * refactor: make LoginItemSettings::path a wstring * refactor: make ShowTaskDialog take a wstr * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b
. Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
258 lines
7.8 KiB
C++
258 lines
7.8 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/win/notify_icon.h"
|
|
|
|
#include <objbase.h>
|
|
#include <utility>
|
|
|
|
#include "base/logging.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/win/windows_version.h"
|
|
#include "shell/browser/ui/win/notify_icon_host.h"
|
|
#include "third_party/skia/include/core/SkBitmap.h"
|
|
#include "ui/display/screen.h"
|
|
#include "ui/display/win/screen_win.h"
|
|
#include "ui/gfx/geometry/point.h"
|
|
#include "ui/gfx/geometry/rect.h"
|
|
#include "ui/gfx/image/image.h"
|
|
#include "ui/views/controls/menu/menu_runner.h"
|
|
|
|
namespace {
|
|
|
|
UINT ConvertIconType(electron::TrayIcon::IconType type) {
|
|
using IconType = electron::TrayIcon::IconType;
|
|
switch (type) {
|
|
case IconType::kNone:
|
|
return NIIF_NONE;
|
|
case IconType::kInfo:
|
|
return NIIF_INFO;
|
|
case IconType::kWarning:
|
|
return NIIF_WARNING;
|
|
case IconType::kError:
|
|
return NIIF_ERROR;
|
|
case IconType::kCustom:
|
|
return NIIF_USER;
|
|
default:
|
|
NOTREACHED() << "Invalid icon type";
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
NotifyIcon::NotifyIcon(NotifyIconHost* host,
|
|
UINT id,
|
|
HWND window,
|
|
UINT message,
|
|
GUID guid)
|
|
: host_(host), icon_id_(id), window_(window), message_id_(message) {
|
|
guid_ = guid;
|
|
is_using_guid_ = guid != GUID_DEFAULT;
|
|
NOTIFYICONDATA icon_data;
|
|
InitIconData(&icon_data);
|
|
icon_data.uFlags |= NIF_MESSAGE;
|
|
icon_data.uCallbackMessage = message_id_;
|
|
BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data);
|
|
// This can happen if the explorer process isn't running when we try to
|
|
// create the icon for some reason (for example, at startup).
|
|
if (!result)
|
|
LOG(WARNING) << "Unable to create status tray icon.";
|
|
}
|
|
|
|
NotifyIcon::~NotifyIcon() {
|
|
// Remove our icon.
|
|
host_->Remove(this);
|
|
NOTIFYICONDATA icon_data;
|
|
InitIconData(&icon_data);
|
|
Shell_NotifyIcon(NIM_DELETE, &icon_data);
|
|
}
|
|
|
|
void NotifyIcon::HandleClickEvent(int modifiers,
|
|
bool left_mouse_click,
|
|
bool double_button_click) {
|
|
gfx::Rect bounds = GetBounds();
|
|
|
|
if (left_mouse_click) {
|
|
if (double_button_click) // double left click
|
|
NotifyDoubleClicked(bounds, modifiers);
|
|
else // single left click
|
|
NotifyClicked(bounds,
|
|
display::Screen::GetScreen()->GetCursorScreenPoint(),
|
|
modifiers);
|
|
return;
|
|
} else if (!double_button_click) { // single right click
|
|
if (menu_model_)
|
|
PopUpContextMenu(gfx::Point(), menu_model_);
|
|
else
|
|
NotifyRightClicked(bounds, modifiers);
|
|
}
|
|
}
|
|
|
|
void NotifyIcon::HandleMouseMoveEvent(int modifiers) {
|
|
gfx::Point cursorPos = display::Screen::GetScreen()->GetCursorScreenPoint();
|
|
// Omit event fired when tray icon is created but cursor is outside of it.
|
|
if (GetBounds().Contains(cursorPos))
|
|
NotifyMouseMoved(cursorPos, modifiers);
|
|
}
|
|
|
|
void NotifyIcon::ResetIcon() {
|
|
NOTIFYICONDATA icon_data;
|
|
InitIconData(&icon_data);
|
|
// Delete any previously existing icon.
|
|
Shell_NotifyIcon(NIM_DELETE, &icon_data);
|
|
InitIconData(&icon_data);
|
|
icon_data.uFlags |= NIF_MESSAGE;
|
|
icon_data.uCallbackMessage = message_id_;
|
|
icon_data.hIcon = icon_.get();
|
|
// If we have an image, then set the NIF_ICON flag, which tells
|
|
// Shell_NotifyIcon() to set the image for the status icon it creates.
|
|
if (icon_data.hIcon)
|
|
icon_data.uFlags |= NIF_ICON;
|
|
// Re-add our icon.
|
|
BOOL result = Shell_NotifyIcon(NIM_ADD, &icon_data);
|
|
if (!result)
|
|
LOG(WARNING) << "Unable to re-create status tray icon.";
|
|
}
|
|
|
|
void NotifyIcon::SetImage(HICON image) {
|
|
icon_ = base::win::ScopedHICON(CopyIcon(image));
|
|
|
|
// Create the icon.
|
|
NOTIFYICONDATA icon_data;
|
|
InitIconData(&icon_data);
|
|
icon_data.uFlags |= NIF_ICON;
|
|
icon_data.hIcon = image;
|
|
BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
|
|
if (!result)
|
|
LOG(WARNING) << "Error setting status tray icon image";
|
|
}
|
|
|
|
void NotifyIcon::SetPressedImage(HICON image) {
|
|
// Ignore pressed images, since the standard on Windows is to not highlight
|
|
// pressed status icons.
|
|
}
|
|
|
|
void NotifyIcon::SetToolTip(const std::string& tool_tip) {
|
|
// Create the icon.
|
|
NOTIFYICONDATA icon_data;
|
|
InitIconData(&icon_data);
|
|
icon_data.uFlags |= NIF_TIP;
|
|
wcsncpy_s(icon_data.szTip, base::UTF8ToWide(tool_tip).c_str(), _TRUNCATE);
|
|
BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
|
|
if (!result)
|
|
LOG(WARNING) << "Unable to set tooltip for status tray icon";
|
|
}
|
|
|
|
void NotifyIcon::DisplayBalloon(const BalloonOptions& options) {
|
|
NOTIFYICONDATA icon_data;
|
|
InitIconData(&icon_data);
|
|
icon_data.uFlags |= NIF_INFO;
|
|
wcsncpy_s(icon_data.szInfoTitle, base::UTF16ToWide(options.title).c_str(),
|
|
_TRUNCATE);
|
|
wcsncpy_s(icon_data.szInfo, base::UTF16ToWide(options.content).c_str(),
|
|
_TRUNCATE);
|
|
icon_data.uTimeout = 0;
|
|
icon_data.hBalloonIcon = options.icon;
|
|
icon_data.dwInfoFlags = ConvertIconType(options.icon_type);
|
|
|
|
if (options.large_icon)
|
|
icon_data.dwInfoFlags |= NIIF_LARGE_ICON;
|
|
|
|
if (options.no_sound)
|
|
icon_data.dwInfoFlags |= NIIF_NOSOUND;
|
|
|
|
if (options.respect_quiet_time)
|
|
icon_data.dwInfoFlags |= NIIF_RESPECT_QUIET_TIME;
|
|
|
|
BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
|
|
if (!result)
|
|
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.";
|
|
}
|
|
|
|
void NotifyIcon::Focus() {
|
|
NOTIFYICONDATA icon_data;
|
|
InitIconData(&icon_data);
|
|
|
|
BOOL result = Shell_NotifyIcon(NIM_SETFOCUS, &icon_data);
|
|
if (!result)
|
|
LOG(WARNING) << "Unable to focus tray icon.";
|
|
}
|
|
|
|
void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
|
|
ElectronMenuModel* menu_model) {
|
|
// Returns if context menu isn't set.
|
|
if (menu_model == nullptr && menu_model_ == nullptr)
|
|
return;
|
|
|
|
// Set our window as the foreground window, so the context menu closes when
|
|
// we click away from it.
|
|
if (!SetForegroundWindow(window_))
|
|
return;
|
|
|
|
// Cancel current menu if there is one.
|
|
CloseContextMenu();
|
|
|
|
// Show menu at mouse's position by default.
|
|
gfx::Rect rect(pos, gfx::Size());
|
|
if (pos.IsOrigin())
|
|
rect.set_origin(display::Screen::GetScreen()->GetCursorScreenPoint());
|
|
|
|
menu_runner_.reset(
|
|
new views::MenuRunner(menu_model != nullptr ? menu_model : menu_model_,
|
|
views::MenuRunner::HAS_MNEMONICS));
|
|
menu_runner_->RunMenuAt(nullptr, nullptr, rect,
|
|
views::MenuAnchorPosition::kTopLeft,
|
|
ui::MENU_SOURCE_MOUSE);
|
|
}
|
|
|
|
void NotifyIcon::CloseContextMenu() {
|
|
if (menu_runner_ && menu_runner_->IsRunning()) {
|
|
menu_runner_->Cancel();
|
|
}
|
|
}
|
|
|
|
void NotifyIcon::SetContextMenu(ElectronMenuModel* menu_model) {
|
|
menu_model_ = menu_model;
|
|
}
|
|
|
|
gfx::Rect NotifyIcon::GetBounds() {
|
|
NOTIFYICONIDENTIFIER icon_id;
|
|
memset(&icon_id, 0, sizeof(NOTIFYICONIDENTIFIER));
|
|
icon_id.uID = icon_id_;
|
|
icon_id.hWnd = window_;
|
|
icon_id.cbSize = sizeof(NOTIFYICONIDENTIFIER);
|
|
if (is_using_guid_) {
|
|
icon_id.guidItem = guid_;
|
|
}
|
|
|
|
RECT rect = {0};
|
|
Shell_NotifyIconGetRect(&icon_id, &rect);
|
|
return display::win::ScreenWin::ScreenToDIPRect(window_, gfx::Rect(rect));
|
|
}
|
|
|
|
void NotifyIcon::InitIconData(NOTIFYICONDATA* icon_data) {
|
|
memset(icon_data, 0, sizeof(NOTIFYICONDATA));
|
|
icon_data->cbSize = sizeof(NOTIFYICONDATA);
|
|
icon_data->hWnd = window_;
|
|
icon_data->uID = icon_id_;
|
|
if (is_using_guid_) {
|
|
icon_data->uFlags = NIF_GUID;
|
|
icon_data->guidItem = guid_;
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|