diff options
Diffstat (limited to 'devel/electron35/files')
6 files changed, 32 insertions, 32 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 c0d887591946..c5d4c6cf8088 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,6 +1,6 @@ ---- electron/shell/browser/native_window_views.cc.orig 2025-05-06 23:52:46 UTC +--- electron/shell/browser/native_window_views.cc.orig 2025-05-13 12:56:52 UTC +++ electron/shell/browser/native_window_views.cc -@@ -50,7 +50,7 @@ +@@ -51,7 +51,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" -@@ -295,7 +295,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -296,7 +296,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"; -@@ -321,7 +321,7 @@ NativeWindowViews::NativeWindowViews(const gin_helper: +@@ -322,7 +322,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. bool use_dark_theme = false; if (options.Get(options::kDarkTheme, &use_dark_theme) && use_dark_theme) { -@@ -430,7 +430,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); -@@ -466,7 +466,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 (IsX11()) { const std::string color = use_dark_theme ? "dark" : "light"; auto* connection = x11::Connection::Get(); -@@ -528,7 +528,7 @@ void NativeWindowViews::Show() { +@@ -529,7 +529,7 @@ void NativeWindowViews::Show() { NotifyWindowShow(); @@ -54,7 +54,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -544,7 +544,7 @@ void NativeWindowViews::ShowInactive() { +@@ -545,7 +545,7 @@ void NativeWindowViews::ShowInactive() { NotifyWindowShow(); @@ -63,7 +63,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowMapped(); -@@ -563,7 +563,7 @@ void NativeWindowViews::Hide() { +@@ -564,7 +564,7 @@ void NativeWindowViews::Hide() { NotifyWindowHide(); @@ -72,7 +72,7 @@ if (global_menu_bar_) global_menu_bar_->OnWindowUnmapped(); #endif -@@ -594,7 +594,7 @@ bool NativeWindowViews::IsEnabled() const { +@@ -595,7 +595,7 @@ bool NativeWindowViews::IsEnabled() const { bool NativeWindowViews::IsEnabled() const { #if BUILDFLAG(IS_WIN) return ::IsWindowEnabled(GetAcceleratedWidget()); @@ -81,7 +81,7 @@ if (IsX11()) return !event_disabler_.get(); NOTIMPLEMENTED(); -@@ -844,7 +844,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bou +@@ -845,7 +845,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_) { -@@ -1102,7 +1102,7 @@ bool NativeWindowViews::IsClosable() const { +@@ -1103,7 +1103,7 @@ bool NativeWindowViews::IsClosable() const { return false; } return !(info.fState & MFS_DISABLED); @@ -99,7 +99,7 @@ return true; #endif } -@@ -1142,7 +1142,7 @@ void NativeWindowViews::Center() { +@@ -1143,7 +1143,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(); -@@ -1365,7 +1365,7 @@ void NativeWindowViews::SetMenu(ElectronMenuModel* men +@@ -1367,7 +1367,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(); -@@ -1420,7 +1420,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* +@@ -1422,7 +1422,7 @@ void NativeWindowViews::SetParentWindow(NativeWindow* void NativeWindowViews::SetParentWindow(NativeWindow* parent) { NativeWindow::SetParentWindow(parent); @@ -126,7 +126,7 @@ if (IsX11()) { auto* connection = x11::Connection::Get(); connection->SetProperty( -@@ -1466,7 +1466,7 @@ void NativeWindowViews::SetProgressBar(double progress +@@ -1468,7 +1468,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); } -@@ -1544,7 +1544,7 @@ bool NativeWindowViews::IsVisibleOnAllWorkspaces() con +@@ -1546,7 +1546,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 (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. -@@ -1567,7 +1567,7 @@ content::DesktopMediaID NativeWindowViews::GetDesktopM +@@ -1569,7 +1569,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 = -@@ -1665,7 +1665,7 @@ void NativeWindowViews::SetIcon(HICON window_icon, HIC +@@ -1667,7 +1667,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()); -@@ -1761,7 +1761,7 @@ bool NativeWindowViews::CanMinimize() const { +@@ -1763,7 +1763,7 @@ bool NativeWindowViews::CanMinimize() const { bool NativeWindowViews::CanMinimize() const { #if BUILDFLAG(IS_WIN) return minimizable_; @@ -171,7 +171,7 @@ return true; #endif } -@@ -1817,7 +1817,7 @@ void NativeWindowViews::HandleKeyboardEvent( +@@ -1819,7 +1819,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) -@@ -1836,7 +1836,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e +@@ -1838,7 +1838,7 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* e // Alt+Click should not toggle menu bar. root_view_.ResetAltState(); diff --git a/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts b/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts index 35a58fabd5cf..5de2e6e8c6d7 100644 --- a/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts +++ b/devel/electron35/files/patch-electron_spec_api-browser-window-spec.ts @@ -1,4 +1,4 @@ ---- electron/spec/api-browser-window-spec.ts.orig 2025-05-06 23:52:46 UTC +--- electron/spec/api-browser-window-spec.ts.orig 2025-05-13 12:56:52 UTC +++ electron/spec/api-browser-window-spec.ts @@ -69,7 +69,7 @@ describe('BrowserWindow module', () => { }).not.to.throw(); @@ -162,7 +162,7 @@ const w = new BrowserWindow({ show: false }); expect(w.resizable).to.be.true('resizable'); -@@ -5429,7 +5429,7 @@ describe('BrowserWindow module', () => { +@@ -5480,7 +5480,7 @@ describe('BrowserWindow module', () => { }); }); diff --git a/devel/electron35/files/patch-ui_gfx_x_atom__cache.cc b/devel/electron35/files/patch-ui_gfx_x_atom__cache.cc index 63790e9c9a27..4e8b2af8ab90 100644 --- a/devel/electron35/files/patch-ui_gfx_x_atom__cache.cc +++ b/devel/electron35/files/patch-ui_gfx_x_atom__cache.cc @@ -1,6 +1,6 @@ ---- ui/gfx/x/atom_cache.cc.orig 2025-01-27 17:37:37 UTC +--- ui/gfx/x/atom_cache.cc.orig 2025-05-15 12:22:59 UTC +++ ui/gfx/x/atom_cache.cc -@@ -155,6 +155,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha +@@ -156,6 +156,7 @@ constexpr auto kAtomsToCache = std::to_array<const cha "application/octet-stream", "application/vnd.chromium.test", "chromium/filename", diff --git a/devel/electron35/files/patch-ui_ozone_platform_x11_x11__window.cc b/devel/electron35/files/patch-ui_ozone_platform_x11_x11__window.cc index 9899581d8db2..d0d4846780cb 100644 --- a/devel/electron35/files/patch-ui_ozone_platform_x11_x11__window.cc +++ b/devel/electron35/files/patch-ui_ozone_platform_x11_x11__window.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/x11_window.cc.orig 2025-01-27 17:37:37 UTC +--- ui/ozone/platform/x11/x11_window.cc.orig 2025-05-15 12:22:59 UTC +++ ui/ozone/platform/x11/x11_window.cc -@@ -1502,7 +1502,7 @@ void X11Window::OnXWindowStateChanged() { +@@ -1509,7 +1509,7 @@ void X11Window::OnXWindowStateChanged() { WindowTiledEdges tiled_state = GetTiledState(); if (tiled_state != tiled_state_) { tiled_state_ = tiled_state; diff --git a/devel/electron35/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/devel/electron35/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 69891b8bc56a..2b89e9b60d12 100644 --- a/devel/electron35/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/devel/electron35/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2025-03-24 20:50:14 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2025-05-15 12:22:59 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -50,7 +50,7 @@ #include "ui/wm/core/window_util.h" @@ -18,7 +18,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1174,7 +1174,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg +@@ -1179,7 +1179,7 @@ bool DesktopWindowTreeHostPlatform::RotateFocusForWidg // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/devel/electron35/files/patch-ui_views_widget_widget.cc b/devel/electron35/files/patch-ui_views_widget_widget.cc index bda30113f082..a7ef80a3b525 100644 --- a/devel/electron35/files/patch-ui_views_widget_widget.cc +++ b/devel/electron35/files/patch-ui_views_widget_widget.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/widget.cc.orig 2025-03-24 20:50:14 UTC +--- ui/views/widget/widget.cc.orig 2025-05-15 12:22:59 UTC +++ ui/views/widget/widget.cc @@ -63,7 +63,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -2444,7 +2444,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -2450,7 +2450,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const return parent_->GetNativeTheme(); } |