mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 133.0.6836.0 * chore: bump chromium in DEPS to 133.0.6838.0 * chore: update patches * 6006096: [Sync ESB] Integrate Chrome Toast UI https://chromium-review.googlesource.com/c/chromium/src/+/6006096 * Confine enable_device_bound_sessions buildflag to //net https://chromium-review.googlesource.com/c/chromium/src/+/6014679 * revert [api] Delete deprecated struct FastApiTypedArray https://chromium-review.googlesource.com/c/v8/v8/+/5982984 Also https://chromium-review.googlesource.com/c/v8/v8/+/5979766/1 * fixup revert [api] Delete deprecated struct FastApiTypedArray * Migrate remaining NOTREACHED()s in chrome/ https://chromium-review.googlesource.com/c/chromium/src/+/5998172 * [Reland][Extensions] Remove ExtensionHostDelegate::GetJavaScriptDialogManager() https://chromium-review.googlesource.com/c/chromium/src/+/6020106 * Remove NOTREACHED_IN_MIGRATION() https://chromium-review.googlesource.com/c/chromium/src/+/6021996 * Remove Lock screen apps [#8] : remove lock screen extension https://chromium-review.googlesource.com/c/chromium/src/+/6005846 * Reland "Add CrashReporterClient::GetProductInfo(ProductInfo*)" https://chromium-review.googlesource.com/c/chromium/src/+/6012631 * Ozone/Wayland: remove lacros specific window states https://chromium-review.googlesource.com/c/chromium/src/+/6011215 * chore: bump chromium in DEPS to 133.0.6840.0 * chore: bump chromium in DEPS to 133.0.6841.0 * chore: bump chromium in DEPS to 133.0.6844.0 * implement virtual WebContents::CanUserEnterFullscreen * OnSearchifyStateChange -> OnSearchifyStarted * regen libc++ filenames * chore: bump chromium in DEPS to 133.0.6846.0 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com>
245 lines
9.0 KiB
C++
245 lines
9.0 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/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/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/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::DesktopNativeWidgetAura* desktop_native_widget_aura)
|
|
: views::DesktopWindowTreeHostLinux(native_window_view->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();
|
|
}
|
|
|
|
gfx::Insets ElectronDesktopWindowTreeHostLinux::CalculateInsetsInDIP(
|
|
ui::PlatformWindowState window_state) const {
|
|
// If we are not showing frame, the insets should be zero.
|
|
if (native_window_view_->IsFullscreen()) {
|
|
return gfx::Insets();
|
|
}
|
|
|
|
if (!native_window_view_->has_frame() ||
|
|
!native_window_view_->has_client_frame()) {
|
|
return gfx::Insets();
|
|
}
|
|
|
|
auto* view = static_cast<ClientFrameViewLinux*>(
|
|
native_window_view_->widget()->non_client_view()->frame_view());
|
|
|
|
gfx::Insets insets = view->GetBorderDecorationInsets();
|
|
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 (ui::OzonePlatform::GetInstance()
|
|
->GetPlatformProperties()
|
|
.electron_can_call_x11) {
|
|
// 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) {
|
|
// CreateNonClientFrameView creates `ClientFrameViewLinux` only when both
|
|
// frame and client_frame booleans are set, otherwise it is a different type
|
|
// of view.
|
|
if (native_window_view_->has_frame() &&
|
|
native_window_view_->has_client_frame()) {
|
|
static_cast<ClientFrameViewLinux*>(
|
|
native_window_view_->widget()->non_client_view()->frame_view())
|
|
->set_tiled_edges(new_tiled_edges);
|
|
}
|
|
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)) {
|
|
if (!native_window_view_->has_frame() ||
|
|
!native_window_view_->has_client_frame())
|
|
return;
|
|
|
|
ui::PlatformWindow* window = platform_window();
|
|
auto window_state = window->GetPlatformWindowState();
|
|
float scale = device_scale_factor();
|
|
auto* view = static_cast<ClientFrameViewLinux*>(
|
|
native_window_view_->widget()->non_client_view()->frame_view());
|
|
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 (!native_window_view_->IsFullscreen()) {
|
|
// 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();
|
|
}
|
|
}
|
|
} // namespace electron
|