a006cf681b
* 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>
227 lines
6.9 KiB
C++
227 lines
6.9 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 <string>
|
|
|
|
#include "base/stl_util.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/win/scoped_gdi_object.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "third_party/skia/include/core/SkBitmap.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.
|
|
const size_t kMaxButtonsCount = 7;
|
|
|
|
// The base id of Thumbar button.
|
|
const 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;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TaskbarHost::ThumbarButton::ThumbarButton() = default;
|
|
TaskbarHost::ThumbarButton::ThumbarButton(const TaskbarHost::ThumbarButton&) =
|
|
default;
|
|
TaskbarHost::ThumbarButton::~ThumbarButton() = default;
|
|
|
|
TaskbarHost::TaskbarHost() {}
|
|
|
|
TaskbarHost::~TaskbarHost() {}
|
|
|
|
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.
|
|
base::win::ScopedHICON icons[kMaxButtonsCount] = {};
|
|
THUMBBUTTON thumb_buttons[kMaxButtonsCount] = {};
|
|
|
|
for (size_t i = 0; 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;
|
|
wcsncpy_s(thumb_button.szTip, base::UTF8ToWide(button.tooltip).c_str(),
|
|
_TRUNCATE);
|
|
}
|
|
|
|
// 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, kMaxButtonsCount,
|
|
thumb_buttons);
|
|
} else {
|
|
r = taskbar_->ThumbBarAddButtons(window, kMaxButtonsCount, thumb_buttons);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
bool TaskbarHost::SetOverlayIcon(HWND window,
|
|
const SkBitmap& overlay,
|
|
const std::string& text) {
|
|
if (!InitializeTaskbar())
|
|
return false;
|
|
|
|
base::win::ScopedHICON icon(IconUtil::CreateHICONFromSkBitmap(overlay));
|
|
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, NULL));
|
|
} else {
|
|
RECT rect =
|
|
display::win::ScreenWin::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
|