system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 20:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibGUI+Browser: Move GUI::UrlBox to the Browser application

Browse source 
Browser is the only user of this component. Move it to allow making use
of LibWebView for URL highlighting.
This commit is contained in:
Timothy Flynn 2023-10-17 13:09:41 -04:00 committed by Andreas Kling
parent 0715ba889e
commit 55092dd164
8 changed files with 139 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Userland/Applications/Browser/CMakeLists.txt
View file

@ -25,6 +25,7 @@ set(SOURCES
StorageModel.cpp
StorageWidget.cpp
Tab.cpp
URLBox.cpp
WindowActions.cpp
main.cpp
)

3
Userland/Applications/Browser/Tab.cpp
View file

@ -21,6 +21,7 @@
#include <AK/StringBuilder.h>
#include <AK/URL.h>
#include <Applications/Browser/TabGML.h>
#include <Applications/Browser/URLBox.h>
#include <Applications/BrowserSettings/Defaults.h>
#include <LibConfig/Client.h>
#include <LibGUI/Action.h>
@ -157,7 +158,7 @@ Tab::Tab(BrowserWindow& window)
toolbar.add_action(window.reload_action());
m_location_box = toolbar.add<GUI::UrlBox>();
m_location_box = toolbar.add<URLBox>();
m_location_box->set_placeholder("Search or enter address"sv);
m_location_box->on_return_pressed = [this] {

3
Userland/Applications/Browser/Tab.h
View file

@ -28,6 +28,7 @@ class InspectorWidget;
class ConsoleWidget;
class HistoryWidget;
class StorageWidget;
class URLBox;
class Tab final : public GUI::Widget {
C_OBJECT(Tab);
@ -120,7 +121,7 @@ private:
RefPtr<WebView::OutOfProcessWebView> m_web_content_view;
RefPtr<GUI::UrlBox> m_location_box;
RefPtr<URLBox> m_location_box;
RefPtr<GUI::Button> m_reset_zoom_button;
RefPtr<GUI::Button> m_bookmark_button;
RefPtr<InspectorWidget> m_dom_inspector_widget;

100
Userland/Applications/Browser/URLBox.cpp Normal file
View file

@ -0,0 +1,100 @@
/*
* Copyright (c) 2023, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/URL.h>
#include <Applications/Browser/URLBox.h>
#include <LibGfx/Palette.h>
#include <LibGfx/TextAttributes.h>
namespace Browser {
URLBox::URLBox()
{
set_auto_focusable(false);
on_change = [this] {
highlight_url();
};
}
void URLBox::focusout_event(GUI::FocusEvent& event)
{
set_focus_transition(true);
highlight_url();
GUI::TextBox::focusout_event(event);
}
void URLBox::focusin_event(GUI::FocusEvent& event)
{
highlight_url();
GUI::TextBox::focusin_event(event);
}
void URLBox::mousedown_event(GUI::MouseEvent& event)
{
if (is_displayonly())
return;
if (event.button() != GUI::MouseButton::Primary)
return;
if (is_focus_transition()) {
GUI::TextBox::select_current_line();
set_focus_transition(false);
} else {
GUI::TextBox::mousedown_event(event);
}
}
void URLBox::highlight_url()
{
auto url = URL::create_with_url_or_path(text());
Vector<GUI::TextDocumentSpan> spans;
if (url.is_valid() && !is_focused()) {
if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "gemini") {
auto serialized_host = url.serialized_host().release_value_but_fixme_should_propagate_errors().to_deprecated_string();
auto host_start = url.scheme().bytes_as_string_view().length() + 3;
auto host_length = serialized_host.length();
// FIXME: Maybe add a generator to use https://publicsuffix.org/list/public_suffix_list.dat
// for now just highlight the whole host
Gfx::TextAttributes default_format;
default_format.color = palette().color(Gfx::ColorRole::PlaceholderText);
spans.append({
{ { 0, 0 }, { 0, host_start } },
default_format,
});
Gfx::TextAttributes host_format;
host_format.color = palette().color(Gfx::ColorRole::BaseText);
spans.append({
{ { 0, host_start }, { 0, host_start + host_length } },
host_format,
});
spans.append({
{ { 0, host_start + host_length }, { 0, text().length() } },
default_format,
});
} else if (url.scheme() == "file") {
Gfx::TextAttributes scheme_format;
scheme_format.color = palette().color(Gfx::ColorRole::PlaceholderText);
spans.append({
{ { 0, 0 }, { 0, url.scheme().bytes_as_string_view().length() + 3 } },
scheme_format,
});
}
}
document().set_spans(0, move(spans));
update();
}
}

34
Userland/Applications/Browser/URLBox.h Normal file
View file

@ -0,0 +1,34 @@
/*
* Copyright (c) 2023, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <LibGUI/TextBox.h>
namespace Browser {
class URLBox : public GUI::TextBox {
C_OBJECT(URLBox)
public:
virtual ~URLBox() override = default;
void set_focus_transition(bool focus_transition) { m_focus_transition = focus_transition; }
bool is_focus_transition() const { return m_focus_transition; }
private:
URLBox();
void highlight_url();
virtual void mousedown_event(GUI::MouseEvent&) override;
virtual void focusout_event(GUI::FocusEvent&) override;
virtual void focusin_event(GUI::FocusEvent&) override;
bool m_focus_transition { true };
};
}

1
Userland/Libraries/LibGUI/Forward.h
View file

@ -79,7 +79,6 @@ class Statusbar;
class TabWidget;
class TableView;
class TextBox;
class UrlBox;
class TextDocument;
class TextDocumentUndoCommand;
class TextEditor;

89
Userland/Libraries/LibGUI/TextBox.cpp
View file

@ -6,16 +6,13 @@
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <AK/URL.h>
#include <AK/Vector.h>
#include <LibGUI/Painter.h>
#include <LibGUI/TextBox.h>
#include <LibGfx/Palette.h>
#include <LibGfx/TextAttributes.h>
REGISTER_WIDGET(GUI, TextBox)
REGISTER_WIDGET(GUI, PasswordBox)
REGISTER_WIDGET(GUI, UrlBox)
namespace GUI {
@ -132,90 +129,4 @@ void PasswordBox::mousedown_event(GUI::MouseEvent& event)
}
}
UrlBox::UrlBox()
: TextBox()
{
set_auto_focusable(false);
on_change = [this] {
highlight_url();
};
}
void UrlBox::focusout_event(GUI::FocusEvent& event)
{
set_focus_transition(true);
highlight_url();
TextBox::focusout_event(event);
}
void UrlBox::focusin_event(GUI::FocusEvent& event)
{
highlight_url();
TextBox::focusin_event(event);
}
void UrlBox::mousedown_event(GUI::MouseEvent& event)
{
if (is_displayonly())
return;
if (event.button() != MouseButton::Primary)
return;
if (is_focus_transition()) {
TextBox::select_current_line();
set_focus_transition(false);
} else {
TextBox::mousedown_event(event);
}
}
void UrlBox::highlight_url()
{
auto url = AK::URL::create_with_url_or_path(text());
Vector<GUI::TextDocumentSpan> spans;
if (url.is_valid() && !is_focused()) {
if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "gemini") {
auto serialized_host = url.serialized_host().release_value_but_fixme_should_propagate_errors().to_deprecated_string();
auto host_start = url.scheme().bytes_as_string_view().length() + 3;
auto host_length = serialized_host.length();
// FIXME: Maybe add a generator to use https://publicsuffix.org/list/public_suffix_list.dat
// for now just highlight the whole host
Gfx::TextAttributes default_format;
default_format.color = palette().color(Gfx::ColorRole::PlaceholderText);
spans.append({
{ { 0, 0 }, { 0, host_start } },
default_format,
});
Gfx::TextAttributes host_format;
host_format.color = palette().color(Gfx::ColorRole::BaseText);
spans.append({
{ { 0, host_start }, { 0, host_start + host_length } },
host_format,
});
spans.append({
{ { 0, host_start + host_length }, { 0, text().length() } },
default_format,
});
} else if (url.scheme() == "file") {
Gfx::TextAttributes scheme_format;
scheme_format.color = palette().color(Gfx::ColorRole::PlaceholderText);
spans.append({
{ { 0, 0 }, { 0, url.scheme().bytes_as_string_view().length() + 3 } },
scheme_format,
});
}
}
document().set_spans(0, move(spans));
update();
}
}

20
Userland/Libraries/LibGUI/TextBox.h
View file

@ -61,24 +61,4 @@ private:
bool m_show_reveal_button { false };
};
class UrlBox : public TextBox {
C_OBJECT(UrlBox)
public:
virtual ~UrlBox() override = default;
void set_focus_transition(bool focus_transition) { m_focus_transition = focus_transition; }
bool is_focus_transition() const { return m_focus_transition; }
private:
UrlBox();
void highlight_url();
virtual void mousedown_event(GUI::MouseEvent&) override;
virtual void focusout_event(GUI::FocusEvent&) override;
virtual void focusin_event(GUI::FocusEvent&) override;
bool m_focus_transition { true };
};
}