From 0c2dc6be66e64591749a43dfa90751c5182cb800 Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Fri, 13 May 2022 00:18:30 +0200 Subject: [PATCH] Help: Use LibWeb to open files via RequestServer --- Userland/Applications/Help/MainWidget.cpp | 17 +---------------- Userland/Applications/Help/main.cpp | 1 + 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/Userland/Applications/Help/MainWidget.cpp b/Userland/Applications/Help/MainWidget.cpp index c294076456..97e534b838 100644 --- a/Userland/Applications/Help/MainWidget.cpp +++ b/Userland/Applications/Help/MainWidget.cpp @@ -267,22 +267,7 @@ ErrorOr MainWidget::initialize_fallibles(GUI::Window& window) void MainWidget::open_url(URL const& url) { if (url.protocol() == "file") { - auto path = url.path(); - auto source_result = m_manual_model->page_view(path); - if (source_result.is_error()) { - GUI::MessageBox::show(window(), String::formatted("{}", source_result.error()), "Failed to open man page", GUI::MessageBox::Type::Error); - return; - } - - auto source = source_result.value(); - String html; - { - auto md_document = Markdown::Document::parse(source); - VERIFY(md_document); - html = md_document->render_to_html(); - } - - m_web_view->load_html(html, url); + m_web_view->load(url); m_web_view->scroll_to_top(); GUI::Application::the()->deferred_invoke([&, path = url.path()] { diff --git a/Userland/Applications/Help/main.cpp b/Userland/Applications/Help/main.cpp index 4a2e781b0e..c3838dee50 100644 --- a/Userland/Applications/Help/main.cpp +++ b/Userland/Applications/Help/main.cpp @@ -33,6 +33,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil("/usr/share/man", "r")); + TRY(Core::System::unveil("/tmp/portal/filesystemaccess", "rw")); TRY(Core::System::unveil("/tmp/portal/launch", "rw")); TRY(Core::System::unveil("/tmp/portal/webcontent", "rw")); TRY(Core::System::unveil(nullptr, nullptr));