aboutsummaryrefslogtreecommitdiff
path: root/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron36/files/patch-electron_shell_browser_native__window__views.cc')
-rw-r--r--devel/electron36/files/patch-electron_shell_browser_native__window__views.cc44
1 files changed, 22 insertions, 22 deletions
diff --git a/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc b/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc
index e1af6770df51..6a1b8f59ec44 100644
--- a/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc
+++ b/devel/electron36/files/patch-electron_shell_browser_native__window__views.cc
@@ -1,6 +1,6 @@
---- electron/shell/browser/native_window_views.cc.orig 2025-08-05 14:34:17 UTC
+--- electron/shell/browser/native_window_views.cc.orig 2025-08-14 14:48:00 UTC
+++ electron/shell/browser/native_window_views.cc
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
#include "ui/wm/core/shadow_types.h"
#include "ui/wm/core/window_util.h"
@@ -9,7 +9,7 @@
#include "base/strings/string_util.h"
#include "shell/browser/browser.h"
#include "shell/browser/linux/unity_service.h"
-@@ -284,7 +284,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -285,7 +285,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";
-@@ -309,7 +309,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -310,7 +310,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);
-@@ -432,7 +432,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper:
+@@ -431,7 +431,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);
-@@ -468,7 +468,7 @@ void NativeWindowViews::SetGTKDarkThemeEnabled(bool us
+@@ -467,7 +467,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();
-@@ -529,7 +529,7 @@ void NativeWindowViews::Show() {
+@@ -528,7 +528,7 @@ void NativeWindowViews::Show() {
NotifyWindowShow();
@@ -54,7 +54,7 @@
if (global_menu_bar_)
global_menu_bar_->OnWindowMapped();
-@@ -545,7 +545,7 @@ void NativeWindowViews::ShowInactive() {
+@@ -544,7 +544,7 @@ void NativeWindowViews::ShowInactive() {
NotifyWindowShow();
@@ -63,7 +63,7 @@
if (global_menu_bar_)
global_menu_bar_->OnWindowMapped();
-@@ -564,7 +564,7 @@ void NativeWindowViews::Hide() {
+@@ -563,7 +563,7 @@ void NativeWindowViews::Hide() {
NotifyWindowHide();
@@ -72,7 +72,7 @@
if (global_menu_bar_)
global_menu_bar_->OnWindowUnmapped();
#endif
-@@ -595,7 +595,7 @@ bool NativeWindowViews::IsEnabled() const {
+@@ -594,7 +594,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();
-@@ -829,7 +829,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou
+@@ -828,7 +828,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_) {
-@@ -1087,7 +1087,7 @@ bool NativeWindowViews::IsClosable() const {
+@@ -1086,7 +1086,7 @@ bool NativeWindowViews::IsClosable() const {
return false;
}
return !(info.fState & MFS_DISABLED);
@@ -99,7 +99,7 @@
return true;
#endif
}
-@@ -1127,7 +1127,7 @@ void NativeWindowViews::Center() {
+@@ -1126,7 +1126,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();
-@@ -1346,7 +1346,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men
+@@ -1350,7 +1350,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();
-@@ -1402,7 +1402,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow*
+@@ -1406,7 +1406,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(
-@@ -1448,7 +1448,7 @@ void NativeWindowViews::SetProgressBar(double progress
+@@ -1452,7 +1452,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);
}
-@@ -1570,7 +1570,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con
+@@ -1574,7 +1574,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.
-@@ -1593,7 +1593,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM
+@@ -1597,7 +1597,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 =
-@@ -1691,7 +1691,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC
+@@ -1695,7 +1695,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());
-@@ -1797,7 +1797,7 @@ bool NativeWindowViews::CanMinimize() const {
+@@ -1807,7 +1807,7 @@ bool NativeWindowViews::CanMinimize() const {
bool NativeWindowViews::CanMinimize() const {
#if BUILDFLAG(IS_WIN)
return minimizable_;
@@ -171,7 +171,7 @@
return true;
#endif
}
-@@ -1853,7 +1853,7 @@ void NativeWindowViews::HandleKeyboardEvent(
+@@ -1863,7 +1863,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)
-@@ -1872,7 +1872,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e
+@@ -1882,7 +1882,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-08-22 11:55:23 +0000