LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-26 04:35:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ladybird: Prohibit GUI interaction of the WebContent process on macOS

Browse Source 
The WebContent process behaves a bit awkwardly on macOS. When we launch
the process, we have to create a QGuiApplication to access system fonts.
But on macOS, doing so creates an entry in the Dock, and also causes the
WebContent to be focused. So if you enter cmd+Q without first focusing
the Ladybird GUI, WebContent is closed, while the Ladybird process keeps
running.
This commit is contained in:
Timothy Flynn 2023-04-26 16:46:55 -04:00 committed by Andreas Kling
parent cc86c07f58
commit 4dcdc3bd25
Notes: sideshowbarker 2024-07-17 06:20:50 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/4dcdc3bd25
Pull-request: https://github.com/SerenityOS/serenity/pull/18525
4 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ladybird/WebContent/CMakeLists.txt
View File

@ -17,6 +17,10 @@ set(WEBCONTENT_SOURCES
main.cpp main.cpp
) )
if (APPLE)
list(APPEND WEBCONTENT_SOURCES MacOSSetup.mm)
endif()
qt_add_executable(WebContent ${WEBCONTENT_SOURCES}) qt_add_executable(WebContent ${WEBCONTENT_SOURCES})
target_include_directories(WebContent PRIVATE ${SERENITY_SOURCE_DIR}/Userland/Services/) target_include_directories(WebContent PRIVATE ${SERENITY_SOURCE_DIR}/Userland/Services/)

9
Ladybird/WebContent/MacOSSetup.h Normal file
View File

@ -0,0 +1,9 @@
/*
* Copyright (c) 2023, Tim Flynn <trflynn89@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
void prohibit_interaction();

15
Ladybird/WebContent/MacOSSetup.mm Normal file
View File

@ -0,0 +1,15 @@
/*
* Copyright (c) 2023, Tim Flynn <trflynn89@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "MacOSSetup.h"
#import <AppKit/NSApplication.h>
void prohibit_interaction()
{
// This prevents WebContent from being displayed in the macOS Dock and becoming the focused,
// interactable application upon launch.
[NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
}

9
Ladybird/WebContent/main.cpp
View File

@ -11,6 +11,7 @@
#include "../Utilities.h" #include "../Utilities.h"
#include "../WebSocketClientManagerLadybird.h" #include "../WebSocketClientManagerLadybird.h"
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <AK/Platform.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
#include <LibCore/LocalServer.h> #include <LibCore/LocalServer.h>
@ -31,6 +32,10 @@
#include <WebContent/PageHost.h> #include <WebContent/PageHost.h>
#include <WebContent/WebDriverConnection.h> #include <WebContent/WebDriverConnection.h>
#if defined(AK_OS_MACOS)
# include "MacOSSetup.h"
#endif
static ErrorOr<void> load_content_filters(); static ErrorOr<void> load_content_filters();
static ErrorOr<void> load_autoplay_allowlist(); static ErrorOr<void> load_autoplay_allowlist();
@ -40,6 +45,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
QGuiApplication app(arguments.argc, arguments.argv); QGuiApplication app(arguments.argc, arguments.argv);
#if defined(AK_OS_MACOS)
prohibit_interaction();
#endif
Core::EventLoopManager::install(*new Ladybird::EventLoopManagerQt); Core::EventLoopManager::install(*new Ladybird::EventLoopManagerQt);
Core::EventLoop event_loop; Core::EventLoop event_loop;