github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-19 03:14:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: set ozone platform for wayland (#48309)

Browse Source 
* fix: set ozone platform for wayland

Co-authored-by: clavin <clavin@electronjs.org>

* whoops, includes. thx charles

Co-authored-by: clavin <clavin@electronjs.org>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
This commit is contained in:
trop[bot]
2025-09-25 15:22:16 -04:00
committed by GitHub
parent 526dfe2577
commit 3179f61bc1
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.gn
View File

@@ -655,6 +655,7 @@ source_set("electron_lib") {
"//ui/events/devices/x11",
"//ui/events/platform/x11",
"//ui/gtk:gtk_config",
"//ui/linux:display_server_utils",
"//ui/linux:linux_ui",
"//ui/linux:linux_ui_factory",
"//ui/wm",

8
shell/browser/electron_browser_main_parts.cc
View File

@@ -68,6 +68,7 @@
#include "ui/base/ui_base_switches.h"
#include "ui/color/color_provider_manager.h"
#include "ui/display/screen.h"
#include "ui/linux/display_server_utils.h"
#include "ui/views/layout/layout_provider.h"
#include "url/url_util.h"
@@ -209,9 +210,14 @@ int ElectronBrowserMainParts::PreEarlyInitialization() {
#if BUILDFLAG(IS_POSIX)
HandleSIGCHLD();
#endif
#if BUILDFLAG(IS_OZONE)
// Initialize Ozone platform and add required feature flags as per platform's
// properties.
#if BUILDFLAG(IS_LINUX)
ui::OzonePlatform::PreEarlyInitialization();
ui::SetOzonePlatformForLinuxIfNeeded(*base::CommandLine::ForCurrentProcess());
#endif
ui::OzonePlatform::PreEarlyInitialization();
#endif // BUILDFLAG(IS_OZONE)
#if BUILDFLAG(IS_MAC)
screen_ = std::make_unique<display::ScopedNativeScreen>();
#endif