![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 137.0.7107.0 * chore: bump chromium in DEPS to 137.0.7109.0 * chore: bump chromium in DEPS to 137.0.7111.0 * chore: bump chromium in DEPS to 137.0.7113.0 * 6384240: Remove double-declaration for accessibility on macOS |6384240
* 6422872: Remove unused includes in isolation_info_mojom_traits.h |6422872
* chore: update patches * 6400733: Avoid ipc_message_macros.h usage in some foo_param_traits_macros.h files |6400733
* chore: update patches * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: iwyu * refactor: prefer value initialization over memset() From the looks up upstream commits in base/, it looks like memset() could trigger `-Wunsafe-buffer-usage` warnings soon? Value initialization is more C++ish and less error-prone anyway, due to memset()'s easily swappable parameters. * refactor: NotifyIcon::InitIconData() returns a NOTIFYICONDATA This follows F.20 in the C++ Core Guidelines and also removes the need for memset() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - strcmp() * fixup! 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: bump chromium in DEPS to 137.0.7115.0 * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: update patches * 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* fix: add pragma for MacSDK unsafe buffers | 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
* chore: bump chromium in DEPS to 137.0.7117.0 * chore: update patches * chore: update filesnames.libcxx.gni * 6431756: Replace SetOwnedByWidget() bool arg with a PassKey. |6431756
* 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* 6428345: Remove ExtensionService usage from ChromeExtensionRegistrarDelegate |6428345
* 6384315: Migrate extensions_enabled from ExtensionService to Registrar |6384315
* 6428749: [extensions] Refactor ExtensionService for AddNewAndUpdateExtension. |6428749
* chore: bump chromium in DEPS to 137.0.7119.0 * 6440290: corner-shape: support inset shadow |6440290
* 6429230: FSA: Move blocked paths to the PermissionContext class |6429230
* chore: update patches * chore: bump chromium in DEPS to 137.0.7121.0 * chore: update patches * fix: partially revert 6443473: Remove ItemDelete from the Mac version of AppleKeychain |6443473
* fix: update filenames.libcxx.gni * chore: bump chromium in DEPS to 137.0.7123.0 * chore: update patches * chore: "grandfather in" electron views too Lock further access to View::set_owned_by_client() |6448510
* chore: update feat_corner_smoothing_css_rule_and_blink_painting.patch corner-shape: support inset shadow |6440290
* refactor: grandfather in AutofillPopupView as a subclass of WidgetDelegateView Add a PassKey for std::make_unique<WidgetDelegateView>() |6442265
* Provide dbus appmenu information on Wayland |6405535
* [extensions] Move OnExtensionInstalled out of ExtensionService. |6443325
* refactor: grandfather in NativeWindowViews for delete callbacks 6433203: Add a PassKey to RegisterDeleteDelegateCallback(). |6433203
* chore: merge the four "grandfather" patches into one * [A11yPerformance] Remove IsAccessibilityAllowed() | 6404386: [A11yPerformance] Remove IsAccessibilityAllowed() |6404386
NB: the changes here are copied from the upstream changes in chrome/browser/ui/webui/accessibility/accessibility_ui.cc * 6420753: [PermissionOptions] Use PermissionDescriptorPtr in PermissionController |6420753
* 6429573: [accessibility] Move mode change out of AccessibilityNotificationWaiter |6429573
* chore: e patches all * 6419936: [win] Change ScreenWin public static methods to virtual |6419936
* 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - fprintf() - fputs() - snprintf() - vsnprintf() * fix: size conversion FTBFS on Win * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcscpy_s() * 6423410: Enable unsafe buffer warnings for chromium, try #3. |6423410
remove all uses of: - wcsncpy_s() * chore: update mas_avoid_private_macos_api_usage.patch.patch 6394283: Remove double-declaration for accessibility on iOS |6394283
Lots of context shear in this commit but the only interesting part is: -+ return nullptr; ++ return {}; Which is needed because the return type is sometimes not a pointer. * chore: e patches all * chore: disable -Wmacro-redefined warning in electron_main_win.cc * chore: bump chromium in DEPS to 137.0.7123.5 * refactor: patch electron PermissionTypes into blink 6387077: [PermissionOptions] Generalize PermissionRequestDescription |6387077
* chore: e patches all * chore: remove the box_painter_base.cc part of feat_corner_smoothing_css_rule_and_blink_painting.patch as per code review @ https://github.com/electron/electron/pull/46482#pullrequestreview-2777338370 * test: enable window-smaller-than-64x64 test on Linux * chore: bump chromium in DEPS to 137.0.7124.1 * chore: bump chromium in DEPS to 137.0.7125.1 * chore: bump chromium in DEPS to 137.0.7127.3 * 6459201: [Extensions] Remove ExtensionSystem::FinishDelayedInstallationIfReady() |6459201
* 6454796: [Extensions] Move (most) registrar delayed install logic to //extensions |6454796
* chore: bump chromium in DEPS to 137.0.7128.1 * chore: e patches all * chore: node ./script/gen-libc++-filenames.js * [views] Gate DesktopWindowTreeHostWin::window_enlargement_ behind flag Refs6428649
* feat: allow opt-out animated_content_sampler. Refs6438681
* Trigger CI --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
288 lines
9.4 KiB
C++
288 lines
9.4 KiB
C++
// Copyright (c) 2015 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/taskbar_host.h"
|
|
|
|
#include <objbase.h>
|
|
#include <array>
|
|
#include <string>
|
|
|
|
#include "base/containers/span.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/win/scoped_gdi_object.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "skia/ext/image_operations.h"
|
|
#include "third_party/skia/include/core/SkBitmap.h"
|
|
#include "third_party/skia/include/core/SkCanvas.h"
|
|
#include "third_party/skia/include/core/SkImage.h"
|
|
#include "third_party/skia/include/core/SkRRect.h"
|
|
#include "ui/display/win/screen_win.h"
|
|
#include "ui/gfx/icon_util.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
// From MSDN:
|
|
// https://msdn.microsoft.com/en-us/library/windows/desktop/dd378460(v=vs.85).aspx#thumbbars
|
|
// The thumbnail toolbar has a maximum of seven buttons due to the limited room.
|
|
constexpr size_t kMaxButtonsCount = 7U;
|
|
|
|
// The base id of Thumbar button.
|
|
constexpr int kButtonIdBase = 40001;
|
|
|
|
bool GetThumbarButtonFlags(const std::vector<std::string>& flags,
|
|
THUMBBUTTONFLAGS* out) {
|
|
THUMBBUTTONFLAGS result = THBF_ENABLED; // THBF_ENABLED == 0
|
|
for (const auto& flag : flags) {
|
|
if (flag == "disabled")
|
|
result |= THBF_DISABLED;
|
|
else if (flag == "dismissonclick")
|
|
result |= THBF_DISMISSONCLICK;
|
|
else if (flag == "nobackground")
|
|
result |= THBF_NOBACKGROUND;
|
|
else if (flag == "hidden")
|
|
result |= THBF_HIDDEN;
|
|
else if (flag == "noninteractive")
|
|
result |= THBF_NONINTERACTIVE;
|
|
else
|
|
return false;
|
|
}
|
|
*out = result;
|
|
return true;
|
|
}
|
|
|
|
template <typename CharT, size_t N>
|
|
void CopyStringToBuf(CharT (&tgt_buf)[N],
|
|
const std::basic_string<CharT> src_str) {
|
|
if constexpr (N < 1U)
|
|
return;
|
|
|
|
const auto src = base::span{src_str};
|
|
const auto n_chars = std::min(src.size(), N - 1U);
|
|
auto tgt = base::span{tgt_buf};
|
|
tgt.first(n_chars).copy_from(src.first(n_chars));
|
|
tgt[n_chars] = CharT{}; // zero-terminate the string
|
|
}
|
|
} // namespace
|
|
|
|
TaskbarHost::ThumbarButton::ThumbarButton() = default;
|
|
TaskbarHost::ThumbarButton::ThumbarButton(const TaskbarHost::ThumbarButton&) =
|
|
default;
|
|
TaskbarHost::ThumbarButton::~ThumbarButton() = default;
|
|
|
|
TaskbarHost::TaskbarHost() = default;
|
|
|
|
TaskbarHost::~TaskbarHost() = default;
|
|
|
|
bool TaskbarHost::SetThumbarButtons(HWND window,
|
|
const std::vector<ThumbarButton>& buttons) {
|
|
if (buttons.size() > kMaxButtonsCount || !InitializeTaskbar())
|
|
return false;
|
|
|
|
callback_map_.clear();
|
|
|
|
// The number of buttons in thumbar can not be changed once it is created,
|
|
// so we have to claim kMaxButtonsCount buttons initially in case users add
|
|
// more buttons later.
|
|
auto icons =
|
|
std::array<base::win::ScopedGDIObject<HICON>, kMaxButtonsCount>{};
|
|
auto thumb_buttons = std::array<THUMBBUTTON, kMaxButtonsCount>{};
|
|
|
|
for (size_t i = 0U; i < kMaxButtonsCount; ++i) {
|
|
THUMBBUTTON& thumb_button = thumb_buttons[i];
|
|
|
|
// Set ID.
|
|
thumb_button.iId = kButtonIdBase + i;
|
|
thumb_button.dwMask = THB_FLAGS;
|
|
|
|
if (i >= buttons.size()) {
|
|
// This button is used to occupy the place in toolbar, and it does not
|
|
// show.
|
|
thumb_button.dwFlags = THBF_HIDDEN;
|
|
continue;
|
|
}
|
|
|
|
// This button is user's button.
|
|
const ThumbarButton& button = buttons[i];
|
|
|
|
// Generate flags.
|
|
thumb_button.dwFlags = THBF_ENABLED;
|
|
if (!GetThumbarButtonFlags(button.flags, &thumb_button.dwFlags))
|
|
return false;
|
|
|
|
// Set icon.
|
|
if (!button.icon.IsEmpty()) {
|
|
thumb_button.dwMask |= THB_ICON;
|
|
icons[i] = IconUtil::CreateHICONFromSkBitmap(button.icon.AsBitmap());
|
|
thumb_button.hIcon = icons[i].get();
|
|
}
|
|
|
|
// Set tooltip.
|
|
if (!button.tooltip.empty()) {
|
|
thumb_button.dwMask |= THB_TOOLTIP;
|
|
CopyStringToBuf(thumb_button.szTip, base::UTF8ToWide(button.tooltip));
|
|
}
|
|
|
|
// Save callback.
|
|
callback_map_[thumb_button.iId] = button.clicked_callback;
|
|
}
|
|
|
|
// Finally add them to taskbar.
|
|
HRESULT r;
|
|
if (thumbar_buttons_added_) {
|
|
r = taskbar_->ThumbBarUpdateButtons(window, thumb_buttons.size(),
|
|
thumb_buttons.data());
|
|
} else {
|
|
r = taskbar_->ThumbBarAddButtons(window, thumb_buttons.size(),
|
|
thumb_buttons.data());
|
|
}
|
|
|
|
thumbar_buttons_added_ = true;
|
|
last_buttons_ = buttons;
|
|
return SUCCEEDED(r);
|
|
}
|
|
|
|
void TaskbarHost::RestoreThumbarButtons(HWND window) {
|
|
if (thumbar_buttons_added_) {
|
|
thumbar_buttons_added_ = false;
|
|
SetThumbarButtons(window, last_buttons_);
|
|
}
|
|
}
|
|
|
|
bool TaskbarHost::SetProgressBar(HWND window,
|
|
double value,
|
|
const NativeWindow::ProgressState state) {
|
|
if (!InitializeTaskbar())
|
|
return false;
|
|
|
|
bool success;
|
|
if (value > 1.0 || state == NativeWindow::ProgressState::kIndeterminate) {
|
|
success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_INDETERMINATE));
|
|
} else if (value < 0 || state == NativeWindow::ProgressState::kNone) {
|
|
success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_NOPROGRESS));
|
|
} else {
|
|
// Unless SetProgressState set a blocking state (TBPF_ERROR, TBPF_PAUSED)
|
|
// for the window, a call to SetProgressValue assumes the TBPF_NORMAL
|
|
// state even if it is not explicitly set.
|
|
// SetProgressValue overrides and clears the TBPF_INDETERMINATE state.
|
|
if (state == NativeWindow::ProgressState::kError) {
|
|
success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_ERROR));
|
|
} else if (state == NativeWindow::ProgressState::kPaused) {
|
|
success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_PAUSED));
|
|
} else {
|
|
success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_NORMAL));
|
|
}
|
|
|
|
if (success) {
|
|
int val = static_cast<int>(value * 100);
|
|
success = SUCCEEDED(taskbar_->SetProgressValue(window, val, 100));
|
|
}
|
|
}
|
|
|
|
return success;
|
|
}
|
|
|
|
// Adapted from SetOverlayIcon in
|
|
// chrome/browser/taskbar/taskbar_decorator_win.cc.
|
|
bool TaskbarHost::SetOverlayIcon(HWND window,
|
|
const SkBitmap& bitmap,
|
|
const std::string& text) {
|
|
if (!InitializeTaskbar())
|
|
return false;
|
|
|
|
base::win::ScopedGDIObject<HICON> icon;
|
|
if (!bitmap.isNull()) {
|
|
DCHECK_GE(bitmap.width(), bitmap.height());
|
|
|
|
constexpr int kOverlayIconSize = 16;
|
|
|
|
// Maintain aspect ratio on resize, but prefer more square.
|
|
// (We used to round down here, but rounding up produces nicer results.)
|
|
const int resized_height =
|
|
base::ClampCeil(kOverlayIconSize *
|
|
(static_cast<float>(bitmap.height()) / bitmap.width()));
|
|
|
|
DCHECK_GE(kOverlayIconSize, resized_height);
|
|
// Since the target size is so small, we use our best resizer.
|
|
SkBitmap sk_icon = skia::ImageOperations::Resize(
|
|
bitmap, skia::ImageOperations::RESIZE_LANCZOS3, kOverlayIconSize,
|
|
resized_height);
|
|
|
|
// Paint the resized icon onto a 16x16 canvas otherwise Windows will badly
|
|
// hammer it to 16x16. We'll use a circular clip to be consistent with the
|
|
// way profile icons are rendered in the profile switcher.
|
|
SkBitmap offscreen_bitmap;
|
|
offscreen_bitmap.allocN32Pixels(kOverlayIconSize, kOverlayIconSize);
|
|
SkCanvas offscreen_canvas(offscreen_bitmap, SkSurfaceProps{});
|
|
offscreen_canvas.clear(SK_ColorTRANSPARENT);
|
|
|
|
static const SkRRect overlay_icon_clip =
|
|
SkRRect::MakeOval(SkRect::MakeWH(kOverlayIconSize, kOverlayIconSize));
|
|
offscreen_canvas.clipRRect(overlay_icon_clip, true);
|
|
|
|
// Note: the original code used kOverlayIconSize - resized_height, but in
|
|
// order to center the icon in the circle clip area, we're going to center
|
|
// it in the paintable region instead, rounding up to the closest pixel to
|
|
// avoid smearing.
|
|
const int y_offset = std::ceilf((kOverlayIconSize - resized_height) / 2.0f);
|
|
offscreen_canvas.drawImage(sk_icon.asImage(), 0, y_offset);
|
|
|
|
icon = IconUtil::CreateHICONFromSkBitmap(offscreen_bitmap);
|
|
if (!icon.is_valid())
|
|
return false;
|
|
}
|
|
|
|
return SUCCEEDED(taskbar_->SetOverlayIcon(window, icon.get(),
|
|
base::UTF8ToWide(text).c_str()));
|
|
}
|
|
|
|
bool TaskbarHost::SetThumbnailClip(HWND window, const gfx::Rect& region) {
|
|
if (!InitializeTaskbar())
|
|
return false;
|
|
|
|
if (region.IsEmpty()) {
|
|
return SUCCEEDED(taskbar_->SetThumbnailClip(window, nullptr));
|
|
} else {
|
|
RECT rect =
|
|
display::win::GetScreenWin()->DIPToScreenRect(window, region).ToRECT();
|
|
return SUCCEEDED(taskbar_->SetThumbnailClip(window, &rect));
|
|
}
|
|
}
|
|
|
|
bool TaskbarHost::SetThumbnailToolTip(HWND window, const std::string& tooltip) {
|
|
if (!InitializeTaskbar())
|
|
return false;
|
|
|
|
return SUCCEEDED(
|
|
taskbar_->SetThumbnailTooltip(window, base::UTF8ToWide(tooltip).c_str()));
|
|
}
|
|
|
|
bool TaskbarHost::HandleThumbarButtonEvent(int button_id) {
|
|
const auto iter = callback_map_.find(button_id);
|
|
if (iter != std::end(callback_map_)) {
|
|
auto callback = iter->second;
|
|
if (!callback.is_null())
|
|
callback.Run();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool TaskbarHost::InitializeTaskbar() {
|
|
if (taskbar_)
|
|
return true;
|
|
|
|
if (FAILED(::CoCreateInstance(CLSID_TaskbarList, nullptr,
|
|
CLSCTX_INPROC_SERVER,
|
|
IID_PPV_ARGS(&taskbar_))) ||
|
|
FAILED(taskbar_->HrInit())) {
|
|
taskbar_.Reset();
|
|
return false;
|
|
} else {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|