aboutsummaryrefslogtreecommitdiff
path: root/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron35/files/patch-electron_shell_browser_native__window__views.cc')
-rw-r--r--devel/electron35/files/patch-electron_shell_browser_native__window__views.cc42
1 files changed, 21 insertions, 21 deletions
diff --git a/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc
index cc2df857179f..8f74632de896 100644
--- a/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron35/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,4 +1,4 @@
---- electron/shell/browser/native_window_views.cc.orig 2025-05-27 20:59:13 UTC
+--- electron/shell/browser/native_window_views.cc.orig 2025-06-25 20:51:20 UTC
+++ electron/shell/browser/native_window_views.cc
@@ -51,7 +51,7 @@
#include "ui/wm/core/shadow_types.h"
@@ -9,7 +9,7 @@
#include "base/strings/string_util.h"
#include "shell/browser/browser.h"
#include "shell/browser/linux/unity_service.h"
-@@ -289,7 +289,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -298,7 +298,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
params.parent = parent->GetNativeWindow();
params.native_widget = new ElectronDesktopNativeWidgetAura(this);
@@ -18,7 +18,7 @@
std::string name = Browser::Get()->GetName();
// Set WM_WINDOW_ROLE.
params.wm_role_name = "browser-window";
-@@ -314,7 +314,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -323,7 +323,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
std::string window_type;
options.Get(options::kType, &window_type);
@@ -27,7 +27,7 @@
// Set _GTK_THEME_VARIANT to dark if we have "dark-theme" option set.
if (options.ValueOrDefault(options::kDarkTheme, false))
SetGTKDarkThemeEnabled(true);
-@@ -436,7 +436,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -447,7 +447,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
if (window)
window->AddPreTargetHandler(this);
@@ -36,7 +36,7 @@
// On linux after the widget is initialized we might have to force set the
// bounds if the bounds are smaller than the current display
SetBounds(gfx::Rect(GetPosition(), bounds.size()), false);
-@@ -472,7 +472,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us
+@@ -483,7 +483,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us
}
void NativeWindowViews::SetGTKDarkThemeEnabled(bool use_dark_theme) {
@@ -45,7 +45,7 @@
if (x11_util::IsX11()) {
const std::string color = use_dark_theme ? "dark" : "light";
auto* connection = x11::Connection::Get();
-@@ -534,7 +534,7 @@ void NativeWindowViews::Show() {
+@@ -545,7 +545,7 @@ void NativeWindowViews::Show() {
NotifyWindowShow();
@@ -54,7 +54,7 @@
if (global_menu_bar_)
global_menu_bar_->OnWindowMapped();
-@@ -550,7 +550,7 @@ void NativeWindowViews::ShowInactive() {
+@@ -561,7 +561,7 @@ void NativeWindowViews::ShowInactive() {
NotifyWindowShow();
@@ -63,7 +63,7 @@
if (global_menu_bar_)
global_menu_bar_->OnWindowMapped();
-@@ -569,7 +569,7 @@ void NativeWindowViews::Hide() {
+@@ -580,7 +580,7 @@ void NativeWindowViews::Hide() {
NotifyWindowHide();
@@ -72,7 +72,7 @@
if (global_menu_bar_)
global_menu_bar_->OnWindowUnmapped();
#endif
-@@ -600,7 +600,7 @@ bool NativeWindowViews::IsEnabled() const {
+@@ -611,7 +611,7 @@ bool NativeWindowViews::IsEnabled() const {
bool NativeWindowViews::IsEnabled() const {
#if BUILDFLAG(IS_WIN)
return ::IsWindowEnabled(GetAcceleratedWidget());
@@ -81,7 +81,7 @@
if (x11_util::IsX11())
return !event_disabler_.get();
NOTIMPLEMENTED();
-@@ -850,7 +850,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -861,7 +861,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
}
#endif
@@ -90,7 +90,7 @@
// On Linux and Windows the minimum and maximum size should be updated with
// window size when window is not resizable.
if (!resizable_) {
-@@ -1108,7 +1108,7 @@ bool NativeWindowViews::IsClosable() const {
+@@ -1119,7 +1119,7 @@ bool NativeWindowViews::IsClosable() const {
return false;
}
return !(info.fState & MFS_DISABLED);
@@ -99,7 +99,7 @@
return true;
#endif
}
-@@ -1148,7 +1148,7 @@ void NativeWindowViews::Center() {
+@@ -1159,7 +1159,7 @@ void NativeWindowViews::Center() {
// for now to avoid breaking API contract, but should consider the long
// term plan for this aligning with upstream.
void NativeWindowViews::Center() {
@@ -108,7 +108,7 @@
auto display =
display::Screen::GetScreen()->GetDisplayNearestWindow(GetNativeWindow());
gfx::Rect window_bounds_in_screen = display.work_area();
-@@ -1372,7 +1372,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
+@@ -1383,7 +1383,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
}
void NativeWindowViews::SetMenu(ElectronMenuModel* menu_model) {
@@ -117,7 +117,7 @@
// Remove global menu bar.
if (global_menu_bar_ && menu_model == nullptr) {
global_menu_bar_.reset();
-@@ -1428,7 +1428,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow*
+@@ -1439,7 +1439,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow*
void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
NativeWindow::SetParentWindow(parent);
@@ -126,7 +126,7 @@
if (x11_util::IsX11()) {
auto* connection = x11::Connection::Get();
connection->SetProperty(
-@@ -1474,7 +1474,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1485,7 +1485,7 @@ void NativeWindowViews::SetProgressBar(double progress
NativeWindow::ProgressState state) {
#if BUILDFLAG(IS_WIN)
taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, state);
@@ -135,7 +135,7 @@
if (unity::IsRunning()) {
unity::SetProgressFraction(progress);
}
-@@ -1552,7 +1552,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
+@@ -1563,7 +1563,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
if (const auto* view_native_widget = widget()->native_widget_private())
return view_native_widget->IsVisibleOnAllWorkspaces();
@@ -144,7 +144,7 @@
if (x11_util::IsX11()) {
// Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to
// determine whether the current window is visible on all workspaces.
-@@ -1575,7 +1575,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1586,7 +1586,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
#if BUILDFLAG(IS_WIN)
window_handle =
reinterpret_cast<content::DesktopMediaID::Id>(accelerated_widget);
@@ -153,7 +153,7 @@
window_handle = static_cast<uint32_t>(accelerated_widget);
#endif
aura::WindowTreeHost* const host =
-@@ -1673,7 +1673,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1684,7 +1684,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
SendMessage(hwnd, WM_SETICON, ICON_BIG,
reinterpret_cast<LPARAM>(app_icon_.get()));
}
@@ -162,7 +162,7 @@
void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
auto* tree_host = views::DesktopWindowTreeHostLinux::GetHostForWidget(
GetAcceleratedWidget());
-@@ -1769,7 +1769,7 @@ bool NativeWindowViews::CanMinimize() const {
+@@ -1780,7 +1780,7 @@ bool NativeWindowViews::CanMinimize() const {
bool NativeWindowViews::CanMinimize() const {
#if BUILDFLAG(IS_WIN)
return minimizable_;
@@ -171,7 +171,7 @@
return true;
#endif
}
-@@ -1825,7 +1825,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1836,7 +1836,7 @@ void NativeWindowViews::HandleKeyboardEvent(
if (widget_destroyed_)
return;
@@ -180,7 +180,7 @@
if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
NotifyWindowExecuteAppCommand(kBrowserBackward);
else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-@@ -1844,7 +1844,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1855,7 +1855,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
// Alt+Click should not toggle menu bar.
root_view_.ResetAltState();
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 04:44:50 +0000