mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 142.0.7401.0
* 6911185: Reland "Send touch moves async immediately after scroll starts."
https://chromium-review.googlesource.com/c/chromium/src/+/6911185
* 6906887: mac: click through content area in main window
https://chromium-review.googlesource.com/c/chromium/src/+/6906887
* 6916667: Expose helper to eliminate duplicate recipes.
https://chromium-review.googlesource.com/c/chromium/src/+/6916667
* 6909842: Switch LegacyRenderWidgetHostHWND from atlcrack.h to msg_util.h.
https://chromium-review.googlesource.com/c/chromium/src/+/6909842
* 6884056: Remove the SecKeychain implementation for the Keychain interface
https://chromium-review.googlesource.com/c/chromium/src/+/6884056
* 6904906: Remove `WTF::` in renderer/core/[p-x].*/
https://chromium-review.googlesource.com/c/chromium/src/+/6904906
* 6556585: [persistent_cache]: PersistentCache for CodeCache
https://chromium-review.googlesource.com/c/chromium/src/+/6556585
* 6904864: Layout: Support abort on the text placeholder layout
https://chromium-review.googlesource.com/c/chromium/src/+/6904864
* chore: fixup patch indices
* chore: bump chromium in DEPS to 142.0.7402.0
* fixup! 6556585: [persistent_cache]: PersistentCache for CodeCache
* chore: fixup patch indices
* 6905244: [api] Remove deprecated `GetIsolate`
https://chromium-review.googlesource.com/c/v8/v8/+/6905244
* 6897694: Remove NativeTheme::UserHasContrastPreference().
https://chromium-review.googlesource.com/c/chromium/src/+/6897694
* 6897477: Remove GetPlatformHighContrastColorScheme() and enum.
https://chromium-review.googlesource.com/c/chromium/src/+/6897477
* 6918198: Reland "Rename display::Screen::GetScreen() to display::Screen::Get()"
https://chromium-review.googlesource.com/c/chromium/src/+/6918198
* 6907147: [LNA] add use counter for websocket mixed-content issues
https://chromium-review.googlesource.com/c/chromium/src/+/6907147
* 6914538: Replace WTF::String with blink::String
https://chromium-review.googlesource.com/c/website/+/6914538
* 6892538: [video pip] Allow touchscreen users to toggle live caption
https://chromium-review.googlesource.com/c/chromium/src/+/6892538
* chore: fix patch
* chore: bump chromium in DEPS to 142.0.7403.0
* build: remove ninja logs
* chore: fixup patch indices
* 6920670: [PDF] Change pdf_extension_util to return dictionaries
https://chromium-review.googlesource.com/c/chromium/src/+/6920670
* 6917864: Devirtualize and inline various NativeTheme getters.
https://chromium-review.googlesource.com/c/chromium/src/+/6917864
* 6920873: [PDF] Simplify PDFDocumentHelperClient::OnSaveURL()
https://chromium-review.googlesource.com/c/chromium/src/+/6920873
* build: don't kill blink/web_tests
* 6923655: Roll libc++ from 954086abf121 to b87b2bb112f8 (4 revisions)
https://chromium-review.googlesource.com/c/chromium/src/+/6923655
* 6905242: Reland "[CSP] Clarify report-only console messages."
https://chromium-review.googlesource.com/c/chromium/src/+/6905242
* fixup! 6897694: Remove NativeTheme::UserHasContrastPreference().
* chore: bump chromium in DEPS to 142.0.7405.0
* 6910012: [LNA] Enable LNA enforcement by default
https://chromium-review.googlesource.com/c/chromium/src/+/6910012
* 6929444: Combine GetInstanceForXXX() implementations.
https://chromium-review.googlesource.com/c/chromium/src/+/6929444
* 6927873: Rename native_widget_types.h -> native_ui_types.h
https://chromium-review.googlesource.com/c/chromium/src/+/6927873
* 6853978: Init perfetto really early in WebView
https://chromium-review.googlesource.com/c/chromium/src/+/6853978
* 6874886: Use only one picker observer to avoid getting duplicate notifications
https://chromium-review.googlesource.com/c/chromium/src/+/6874886
* chore: fixup patch indices
* fix: Protocol complex inline dtor
* chore: bump chromium in DEPS to 142.0.7407.0
* chore: bump chromium in DEPS to 142.0.7409.0
* chore: bump chromium in DEPS to 142.0.7411.0
* chore: bump chromium in DEPS to 142.0.7413.0
* fixup! 6905242: Reland "[CSP] Clarify report-only console messages."
* 6927233: Remove NativeTheme "use dark colors" bit.
https://chromium-review.googlesource.com/c/chromium/src/+/6927233
* chore: fixup patch indices
* 6899206: [PermissionOptions] Multi-state permission subscriptions & setting changes
https://chromium-review.googlesource.com/c/chromium/src/+/6899206
* chore: bump chromium in DEPS to 142.0.7415.0
* 6936895: [headless] Remove headless flag from views::Widget class
https://chromium-review.googlesource.com/c/chromium/src/+/6936895
We should probably followup on this to see if there is a way to do this without reverting this CL.
* 6937023: Reland "Use new DBus type system in dbus_xdg::Request"
https://chromium-review.googlesource.com/c/chromium/src/+/6937023
* chore: update patches
* 6944749: Add GN visibility list to //components/os_crypt/sync
https://chromium-review.googlesource.com/c/chromium/src/+/6944749
* Further replace sub_capture_target_version with CaptureVersion
https://chromium-review.googlesource.com/c/chromium/src/+/6935455
* fixup for lint
* chore: update filenames.libcxx.gni
* chore: bump chromium in DEPS to 142.0.7417.0
* 6944136: Reorder NativeTheme headers/.cc files.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944136
* 6939701: [DSSC][4] Make FSVCI objects aware of their capture-version-source
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6939701
* 6944404: Remove extraneous callback call
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944404
* 6936124: [FPF-CI]: Introduce blink::NoiseToken for fingerprinting protection
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6936124
* chore: update patches
* fixup! 6927233: Remove NativeTheme "use dark colors" bit.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233
* fixup! 6917864: Devirtualize and inline various NativeTheme getters.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6917864
* 6937588: Add initial OsSettingsProvider object, supplying caret blink interval.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6937588
* fixup! 6905242: Reland "[CSP] Clarify report-only console messages."
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6905242
* 6907515: Replace SingletonHwndObserver with a CallbackList on SingletonHwnd.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6907515
* 6910482: [Save to Drive] Implement retry functionality
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6910482
* fixup! 6927233: Remove NativeTheme "use dark colors" bit.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233
* Revert "build: remove ninja logs"
This reverts commit 72874740fd.
* test: fix flakey test picked from PR 48205
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
Co-authored-by: Alice Zhao <alicelovescake@anthropic.com>
308 lines
12 KiB
C++
308 lines
12 KiB
C++
// Copyright (c) 2021 Ryan Gonzalez.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
// Portions of this file are sourced from
|
|
// chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc,
|
|
// Copyright (c) 2019 The Chromium Authors,
|
|
// which is governed by a BSD-style license
|
|
|
|
#include "shell/browser/ui/electron_desktop_window_tree_host_linux.h"
|
|
|
|
#include <vector>
|
|
|
|
#include "base/feature_list.h"
|
|
#include "base/i18n/rtl.h"
|
|
#include "shell/browser/api/electron_api_web_contents.h"
|
|
#include "shell/browser/linux/x11_util.h"
|
|
#include "shell/browser/native_window_features.h"
|
|
#include "shell/browser/native_window_views.h"
|
|
#include "shell/browser/ui/views/client_frame_view_linux.h"
|
|
#include "third_party/skia/include/core/SkRegion.h"
|
|
#include "ui/aura/window_delegate.h"
|
|
#include "ui/base/hit_test.h"
|
|
#include "ui/display/screen.h"
|
|
#include "ui/gfx/geometry/rect.h"
|
|
#include "ui/gfx/geometry/skia_conversions.h"
|
|
#include "ui/linux/linux_ui.h"
|
|
#include "ui/ozone/public/ozone_platform.h"
|
|
#include "ui/platform_window/platform_window.h"
|
|
#include "ui/platform_window/platform_window_init_properties.h"
|
|
#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
|
|
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
|
|
|
|
namespace electron {
|
|
|
|
ElectronDesktopWindowTreeHostLinux::ElectronDesktopWindowTreeHostLinux(
|
|
NativeWindowViews* native_window_view,
|
|
views::Widget* widget,
|
|
views::DesktopNativeWidgetAura* desktop_native_widget_aura)
|
|
: views::DesktopWindowTreeHostLinux{widget, desktop_native_widget_aura},
|
|
native_window_view_{native_window_view} {}
|
|
|
|
ElectronDesktopWindowTreeHostLinux::~ElectronDesktopWindowTreeHostLinux() =
|
|
default;
|
|
|
|
bool ElectronDesktopWindowTreeHostLinux::SupportsClientFrameShadow() const {
|
|
return platform_window()->CanSetDecorationInsets() &&
|
|
views::Widget::IsWindowCompositingSupported();
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnWidgetInitDone() {
|
|
views::DesktopWindowTreeHostLinux::OnWidgetInitDone();
|
|
UpdateFrameHints();
|
|
}
|
|
|
|
bool ElectronDesktopWindowTreeHostLinux::IsShowingFrame() const {
|
|
return !native_window_view_->IsFullscreen() &&
|
|
!native_window_view_->IsMaximized() &&
|
|
!native_window_view_->IsMinimized();
|
|
}
|
|
|
|
gfx::Insets ElectronDesktopWindowTreeHostLinux::CalculateInsetsInDIP(
|
|
ui::PlatformWindowState window_state) const {
|
|
// If we are not showing frame, the insets should be zero.
|
|
if (!IsShowingFrame()) {
|
|
return gfx::Insets();
|
|
}
|
|
|
|
auto* const view = native_window_view_->GetClientFrameViewLinux();
|
|
if (!view)
|
|
return {};
|
|
|
|
gfx::Insets insets = view->RestoredMirroredFrameBorderInsets();
|
|
if (base::i18n::IsRTL())
|
|
insets.set_left_right(insets.right(), insets.left());
|
|
return insets;
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnBoundsChanged(
|
|
const BoundsChange& change) {
|
|
views::DesktopWindowTreeHostLinux::OnBoundsChanged(change);
|
|
UpdateFrameHints();
|
|
|
|
if (x11_util::IsX11()) {
|
|
// The OnWindowStateChanged should receive all updates but currently under
|
|
// X11 it doesn't receive changes to the fullscreen status because chromium
|
|
// is handling the fullscreen state changes synchronously, see
|
|
// X11Window::ToggleFullscreen in ui/ozone/platform/x11/x11_window.cc.
|
|
UpdateWindowState(platform_window()->GetPlatformWindowState());
|
|
}
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnWindowStateChanged(
|
|
ui::PlatformWindowState old_state,
|
|
ui::PlatformWindowState new_state) {
|
|
views::DesktopWindowTreeHostLinux::OnWindowStateChanged(old_state, new_state);
|
|
UpdateFrameHints();
|
|
UpdateWindowState(new_state);
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnWindowTiledStateChanged(
|
|
ui::WindowTiledEdges new_tiled_edges) {
|
|
if (auto* const view = native_window_view_->GetClientFrameViewLinux()) {
|
|
bool maximized = new_tiled_edges.top && new_tiled_edges.left &&
|
|
new_tiled_edges.bottom && new_tiled_edges.right;
|
|
bool tiled = new_tiled_edges.top || new_tiled_edges.left ||
|
|
new_tiled_edges.bottom || new_tiled_edges.right;
|
|
view->set_tiled(tiled && !maximized);
|
|
}
|
|
UpdateFrameHints();
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::UpdateWindowState(
|
|
ui::PlatformWindowState new_state) {
|
|
if (window_state_ == new_state)
|
|
return;
|
|
|
|
switch (window_state_) {
|
|
case ui::PlatformWindowState::kMinimized:
|
|
native_window_view_->NotifyWindowRestore();
|
|
break;
|
|
case ui::PlatformWindowState::kMaximized:
|
|
native_window_view_->NotifyWindowUnmaximize();
|
|
break;
|
|
case ui::PlatformWindowState::kFullScreen:
|
|
native_window_view_->NotifyWindowLeaveFullScreen();
|
|
break;
|
|
case ui::PlatformWindowState::kUnknown:
|
|
case ui::PlatformWindowState::kNormal:
|
|
break;
|
|
}
|
|
switch (new_state) {
|
|
case ui::PlatformWindowState::kMinimized:
|
|
native_window_view_->NotifyWindowMinimize();
|
|
break;
|
|
case ui::PlatformWindowState::kMaximized:
|
|
native_window_view_->NotifyWindowMaximize();
|
|
break;
|
|
case ui::PlatformWindowState::kFullScreen:
|
|
native_window_view_->NotifyWindowEnterFullScreen();
|
|
break;
|
|
case ui::PlatformWindowState::kUnknown:
|
|
case ui::PlatformWindowState::kNormal:
|
|
break;
|
|
}
|
|
window_state_ = new_state;
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnNativeThemeUpdated(
|
|
ui::NativeTheme* observed_theme) {
|
|
UpdateFrameHints();
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::OnDeviceScaleFactorChanged() {
|
|
UpdateFrameHints();
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::UpdateFrameHints() {
|
|
if (base::FeatureList::IsEnabled(features::kWaylandWindowDecorations)) {
|
|
auto* const view = native_window_view_->GetClientFrameViewLinux();
|
|
if (!view)
|
|
return;
|
|
|
|
ui::PlatformWindow* window = platform_window();
|
|
auto window_state = window->GetPlatformWindowState();
|
|
float scale = device_scale_factor();
|
|
const gfx::Size widget_size =
|
|
view->GetWidget()->GetWindowBoundsInScreen().size();
|
|
|
|
if (SupportsClientFrameShadow()) {
|
|
auto insets = CalculateInsetsInDIP(window_state);
|
|
if (insets.IsEmpty()) {
|
|
window->SetInputRegion(std::nullopt);
|
|
} else {
|
|
gfx::Rect input_bounds(widget_size);
|
|
input_bounds.Inset(insets - view->GetInputInsets());
|
|
input_bounds = gfx::ScaleToEnclosingRect(input_bounds, scale);
|
|
window->SetInputRegion(
|
|
std::optional<std::vector<gfx::Rect>>({input_bounds}));
|
|
}
|
|
}
|
|
|
|
if (ui::OzonePlatform::GetInstance()->IsWindowCompositingSupported()) {
|
|
// Set the opaque region.
|
|
std::vector<gfx::Rect> opaque_region;
|
|
if (IsShowingFrame()) {
|
|
// The opaque region is a list of rectangles that contain only fully
|
|
// opaque pixels of the window. We need to convert the clipping
|
|
// rounded-rect into this format.
|
|
SkRRect rrect = view->GetRoundedWindowContentBounds();
|
|
gfx::RectF rectf(view->GetWindowContentBounds());
|
|
rectf.Scale(scale);
|
|
// It is acceptable to omit some pixels that are opaque, but the region
|
|
// must not include any translucent pixels. Therefore, we must
|
|
// conservatively scale to the enclosed rectangle.
|
|
gfx::Rect rect = gfx::ToEnclosedRect(rectf);
|
|
|
|
// Create the initial region from the clipping rectangle without rounded
|
|
// corners.
|
|
SkRegion region(gfx::RectToSkIRect(rect));
|
|
|
|
// Now subtract out the small rectangles that cover the corners.
|
|
struct {
|
|
SkRRect::Corner corner;
|
|
bool left;
|
|
bool upper;
|
|
} kCorners[] = {
|
|
{SkRRect::kUpperLeft_Corner, true, true},
|
|
{SkRRect::kUpperRight_Corner, false, true},
|
|
{SkRRect::kLowerLeft_Corner, true, false},
|
|
{SkRRect::kLowerRight_Corner, false, false},
|
|
};
|
|
for (const auto& corner : kCorners) {
|
|
auto radii = rrect.radii(corner.corner);
|
|
auto rx = std::ceil(scale * radii.x());
|
|
auto ry = std::ceil(scale * radii.y());
|
|
auto corner_rect = SkIRect::MakeXYWH(
|
|
corner.left ? rect.x() : rect.right() - rx,
|
|
corner.upper ? rect.y() : rect.bottom() - ry, rx, ry);
|
|
region.op(corner_rect, SkRegion::kDifference_Op);
|
|
}
|
|
|
|
auto translucent_top_area_rect = SkIRect::MakeXYWH(
|
|
rect.x(), rect.y(), rect.width(),
|
|
std::ceil(view->GetTranslucentTopAreaHeight() * scale - rect.y()));
|
|
region.op(translucent_top_area_rect, SkRegion::kDifference_Op);
|
|
|
|
// Convert the region to a list of rectangles.
|
|
for (SkRegion::Iterator i(region); !i.done(); i.next()) {
|
|
opaque_region.push_back(gfx::SkIRectToRect(i.rect()));
|
|
}
|
|
} else {
|
|
// The entire window except for the translucent top is opaque.
|
|
gfx::Rect opaque_region_dip(widget_size);
|
|
gfx::Insets insets;
|
|
insets.set_top(view->GetTranslucentTopAreaHeight());
|
|
opaque_region_dip.Inset(insets);
|
|
opaque_region.push_back(
|
|
gfx::ScaleToEnclosingRect(opaque_region_dip, scale));
|
|
}
|
|
window->SetOpaqueRegion(opaque_region);
|
|
}
|
|
|
|
SizeConstraintsChanged();
|
|
}
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::DispatchEvent(ui::Event* event) {
|
|
if (event->IsMouseEvent()) {
|
|
auto* mouse_event = static_cast<ui::MouseEvent*>(event);
|
|
bool is_mousedown = mouse_event->type() == ui::EventType::kMousePressed;
|
|
bool is_system_menu_trigger =
|
|
is_mousedown &&
|
|
(mouse_event->IsRightMouseButton() ||
|
|
(mouse_event->IsLeftMouseButton() && mouse_event->IsControlDown()));
|
|
|
|
if (!is_system_menu_trigger) {
|
|
views::DesktopWindowTreeHostLinux::DispatchEvent(event);
|
|
return;
|
|
}
|
|
|
|
// Determine the non-client area and dispatch 'system-context-menu'.
|
|
if (GetContentWindow() && GetContentWindow()->delegate()) {
|
|
ui::LocatedEvent* located_event = event->AsLocatedEvent();
|
|
gfx::PointF location = located_event->location_f();
|
|
gfx::PointF location_in_dip =
|
|
GetRootTransform().InverseMapPoint(location).value_or(location);
|
|
int hit_test_code = GetContentWindow()->delegate()->GetNonClientComponent(
|
|
gfx::ToRoundedPoint(location_in_dip));
|
|
if (hit_test_code != HTCLIENT && hit_test_code != HTNOWHERE) {
|
|
bool prevent_default = false;
|
|
native_window_view_->NotifyWindowSystemContextMenu(
|
|
located_event->x(), located_event->y(), &prevent_default);
|
|
|
|
// If |prevent_default| is true, then the user might want to show a
|
|
// custom menu - proceed propagation and emit context-menu in the
|
|
// renderer. Otherwise, show the native system window controls menu.
|
|
if (prevent_default) {
|
|
electron::api::WebContents::SetDisableDraggableRegions(true);
|
|
views::DesktopWindowTreeHostLinux::DispatchEvent(event);
|
|
electron::api::WebContents::SetDisableDraggableRegions(false);
|
|
} else {
|
|
if (ui::OzonePlatform::GetInstance()
|
|
->GetPlatformRuntimeProperties()
|
|
.supports_server_window_menus) {
|
|
views::DesktopWindowTreeHostLinux::ShowWindowControlsMenu(
|
|
display::Screen::Get()->GetCursorScreenPoint());
|
|
}
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
views::DesktopWindowTreeHostLinux::DispatchEvent(event);
|
|
}
|
|
|
|
void ElectronDesktopWindowTreeHostLinux::AddAdditionalInitProperties(
|
|
const views::Widget::InitParams& params,
|
|
ui::PlatformWindowInitProperties* properties) {
|
|
views::DesktopWindowTreeHostLinux::AddAdditionalInitProperties(params,
|
|
properties);
|
|
const auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(nullptr);
|
|
properties->prefer_dark_theme =
|
|
linux_ui_theme && linux_ui_theme->PreferDarkTheme();
|
|
}
|
|
|
|
} // namespace electron
|