50b9c7051e
* chore: bump chromium in DEPS to 675d7dc9f3334b15c3ec28c27db3dc19b26bd12e * chore: update patches * chore: bump chromium in DEPS to dce3562696f165a324273fcb6893f0e1fef42ab1 * chore: const interfaces are being removed from //content Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1631749 Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=908139 * chore: update patches * chore: blink::MediaStreamType is now consistent and deduplicated * chore: update patches and printing code for ref -> uniq * chore: bridge_impl() --> GetInProcessNSWindowBridge Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1642988 * fixme: TotalMarkedObjectSize has been removed * chore: fix linting * chore: bump chromium in DEPS to 9503e1a2fcbf17db08094d8caae3e1407e918af3 * chore: fix slightly broken printing patch * chore: update patches for SiteInstanceImpl changes Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1612025 * chore: update patches for SiteInstanceImpl changes * chore: bump chromium in DEPS to 6801e6c1ddd1b7b73e594e97157ddd539ca335d7 * chore: update patches * chore: bump chromium in DEPS to 27e198912d7c1767052ec785c22e2e88b2cb4d8b * chore: remove system_request_context Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1647172 * chore: creation of FtpProtocolHandler needs an auth cache Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1639683 * fixme: disable marked spec * chore: bump chromium in DEPS to 3dcd7fe453ad13a22b114b95f05590eba74c5471 * chore: bump chromium in DEPS to bdc24128b75008743d819e298557a53205706e7c * chore: bump chromium in DEPS to 7da330b58fbe0ba94b9b94abbb8085bead220228 * update patches * remove TotalMarkedObjectSize https://chromium-review.googlesource.com/c/chromium/src/+/1631708 * add libvulkan.so to dist zip manifest on linux * chore: bump chromium in DEPS to 1e85d0f45b52649efd0010cc9dab6d2804f24443 * update patches * add angle features to gpuinfo https://chromium-review.googlesource.com/c/chromium/src/+/1638658 * mark 'marked' property as deprecated * disable webview resize test * FIXME: disable vulkan on 32-bit arm * chore: bump chromium in DEPS to cd0297c6a83fdd2b1f6bc312e7d5acca736a3c56 * Revert "FIXME: disable vulkan on 32-bit arm" This reverts commit 5c1e0ef302a6db1e72231d4e823f91bb08e281af. * backport from upstream: fix swiftshader build on arm https://swiftshader-review.googlesource.com/c/SwiftShader/+/32768/ * update patches * viz: update OutputDeviceWin to new shared memory api https://chromium-review.googlesource.com/c/chromium/src/+/1649574 * base::Contains{Key,Value} => base::Contains https://chromium-review.googlesource.com/c/chromium/src/+/1649478 * fixup! viz: update OutputDeviceWin to new shared memory api * stub out StatusIconLinuxDbus-related delegate methods https://chromium-review.googlesource.com/c/chromium/src/+/1638180 * chore: bump chromium in DEPS to 964ea3fd4bdc006d62533f5755043076220181f1 * Remove the BrowserContext methods to create URLRequestContexts for main/media partitions when a partition_domain is specified https://chromium-review.googlesource.com/c/chromium/src/+/1655087 * fixup! stub out StatusIconLinuxDbus-related delegate methods * add remote_cocoa to chromium_src deps https://chromium-review.googlesource.com/c/chromium/src/+/1657068 * fixup! stub out StatusIconLinuxDbus-related delegate methods * attempt at fix linux-debug build * add swiftshader/libvulkan.so to arm manifest * chore: bump chromium in DEPS to 28688f76afef27c36631aa274691e333ddecdc22 * update patches * chore: bump chromium in DEPS to fe7450e1578a9584189f87d59d0d1a8548bf6b90 * chore: bump chromium in DEPS to f304dfd682dc86a755a6c49a16ee6876e0db45fb * chore: bump chromium in DEPS to f0fd4d6c365aad9edd83bdfff9954c47d271b75c * Update patches * Remove no longer needed WOA patch * Put back IOThread in BrowserProcess We need this until we enable the network service. * move atom.ico to inputs * Update to latest LKGR to fix no template named 'bitset' in namespace 'std' * fixup! Put back IOThread in BrowserProcess * chore: bump chromium in DEPS to dcf9662dc9a896a175d791001350324167b1cad3 * Update patches content_allow_embedder_to_prevent_locking_scheme_registry.patch is no longer necessary as it was upstreamed via https://chromium-review.googlesource.com/c/chromium/src/+/1637040 * Fix renamed enum * Use newer docker container Contains updated dependencies * Try to track down arm test failures * Fix arm tests * chore: bump chromium in DEPS to 8cbceef57b37ee14b9c4c3405a3f7663922c5b5d * Update patches * Add needed dependencies for testing 32-bit linux * Remove arm debugging. * Remove additional debugging * Fix compiler errors * Handle new macOS helper * Fix compile error on Linux * chore: bump chromium in DEPS to 66a93991ddaff6a9f1b13d110959947cb03a1860 * Add new helper files to manifests * fix BUILD.gn for macOS * Fix compile errors * Add patch to put back colors needed for autofill/datalist * chore: bump chromium in DEPS to e89617079f11e33f33cdb3924f719a579c73704b * Updated patches * Remove no longer needed patch * Remove no longer needed patch * Fix compile error with patch * Really fix the patch * chore: bump chromium in DEPS to c70f12476a45840408f1d5ff5968e7f7ceaad9d4 * chore: bump chromium in DEPS to 06d2dd7a8933b41545a7c26349c802f570563fd5 * chore: bump chromium in DEPS to b0b9ff8f727deb519ccbec7cf1c8d9ed543d88ab * Update patches * Fix compiler errors * Fix removed ChromeNetLog * Revert "Fix removed ChromeNetLog" This reverts commit 426dfd90b5ab0a9c1df415d71c88e8aed2bd5bbe. * Remove ChromeNetLog. https://chromium-review.googlesource.com/c/chromium/src/+/1663846 * chore: bump chromium in DEPS to fefcc4926d58dccd59ac95be65eab3a4ebfe2f29 * Update patches * Update v8 patches * Fix lint error * Fix compile errors * chore: bump chromium in DEPS to 4de815ef92ef2eef515506fe09bdc466526a8fd9 * Use custom protocol to test baseURLForDataURL * Use newer SDK (10.0.18362) for Windows * Update patches * Update arm manifest since swiftshader reenabled. * Don't delete dir that isn't ever there. * Fix compile errors. * Need src dir created * Update for removed InspectorFrontendAPI.addExtensions * Revert "Use newer SDK (10.0.18362) for Windows" This reverts commit 68763a0c88cdc44b971462e49662aecc167d3d99. * Revert "Need src dir created" This reverts commit 7daedc29d0844316d4097648dde7f40f1a3848fb. * Revert "Don't delete dir that isn't ever there." This reverts commit bf424bc30ffcb23b1d9a634d4df410342536640e. * chore: bump chromium in DEPS to 97dab6b0124ea53244caf123921b5d14893bcca7 * chore: bump chromium in DEPS to c87d16d49a85dc7122781f6c979d354c20f7f78b * chore: bump chromium in DEPS to 004bcee2ea336687cedfda8f8a151806ac757d15 * chore: bump chromium in DEPS to 24428b26a9d15a013b2a253e1084ec3cb54b660b * chore: bump chromium in DEPS to fd25914e875237df88035a6abf89a70bf1360b57 * Update patches * Update node to fix build error * Fix compile errors * chore: bump chromium in DEPS to 3062b7cf090f1d9522c04ca8fa0a906f88ababe9 * chore: update node ref for pushed tags * chore: update patches for new chromium * chore: fix printing patches * Use new (10.0.18362) Windows SDK * roll node to fix v8 build issues in debug build * Add support for plugin helper * fix: add patch to fix gpu info enumeration Can be removed once CL lands upstream. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1685993 * spec: navigator.requestMIDIAccess now requires a secure origin This test requires a secure origin so we fake one. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1657952 * FIXME: temporarily disable SharedWorker tests * use released version of node-abstractsocket * fix abstract-socket
226 lines
6.9 KiB
C++
226 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 initialy 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::UTF8ToUTF16(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 gfx::Image& overlay,
|
|
const std::string& text) {
|
|
if (!InitializeTaskbar())
|
|
return false;
|
|
|
|
base::win::ScopedHICON icon(
|
|
IconUtil::CreateHICONFromSkBitmap(overlay.AsBitmap()));
|
|
return SUCCEEDED(taskbar_->SetOverlayIcon(window, icon.get(),
|
|
base::UTF8ToUTF16(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::UTF8ToUTF16(tooltip).c_str()));
|
|
}
|
|
|
|
bool TaskbarHost::HandleThumbarButtonEvent(int button_id) {
|
|
if (base::Contains(callback_map_, button_id)) {
|
|
auto callback = callback_map_[button_id];
|
|
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
|