RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 04:57:45 +00:00
Code Issues Activity Actions

Ladybird: Allow creating new tabs with plain HTML

Browse source 
This will allow us to internally create a new tab with HTML, to be used
by the View Source command.
This commit is contained in:
Timothy Flynn 2023-08-28 16:14:34 -04:00 • committed by Tim Flynn
parent 9c4ce1b80b
commit a718a1f3a6
10 changed files with 83 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ladybird/AppKit/Application/ApplicationDelegate.h
View file

@ -28,6 +28,11 @@
fromTab:(nullable Tab*)tab
activateTab:(Web::HTML::ActivateTab)activate_tab;
- (nonnull TabController*)createNewTab:(StringView)html
url:(URL const&)url
fromTab:(nullable Tab*)tab
activateTab:(Web::HTML::ActivateTab)activate_tab;
- (void)removeTab:(nonnull TabController*)controller;
- (Browser::CookieJar&)cookieJar;

40
Ladybird/AppKit/Application/ApplicationDelegate.mm
View file

@ -86,19 +86,20 @@
fromTab:(Tab*)tab
activateTab:(Web::HTML::ActivateTab)activate_tab
{
auto* controller = [[TabController alloc] init:url.value_or(m_new_tab_page_url)];
[controller showWindow:nil];
auto* controller = [self createNewTab:activate_tab fromTab:tab];
[controller loadURL:url.value_or(m_new_tab_page_url)];
if (tab) {
[[tab tabGroup] addWindow:controller.window];
return controller;
}
// FIXME: Can we create the tabbed window above without it becoming active in the first place?
if (activate_tab == Web::HTML::ActivateTab::No) {
[tab orderFront:nil];
}
}
- (nonnull TabController*)createNewTab:(StringView)html
url:(URL const&)url
fromTab:(nullable Tab*)tab
activateTab:(Web::HTML::ActivateTab)activate_tab
{
auto* controller = [self createNewTab:activate_tab fromTab:tab];
[controller loadHTML:html url:url];
[self.managed_tabs addObject:controller];
return controller;
}
@ -124,6 +125,25 @@
#pragma mark - Private methods
- (nonnull TabController*)createNewTab:(Web::HTML::ActivateTab)activate_tab
fromTab:(nullable Tab*)tab
{
auto* controller = [[TabController alloc] init];
[controller showWindow:nil];
if (tab) {
[[tab tabGroup] addWindow:controller.window];
// FIXME: Can we create the tabbed window above without it becoming active in the first place?
if (activate_tab == Web::HTML::ActivateTab::No) {
[tab orderFront:nil];
}
}
[self.managed_tabs addObject:controller];
return controller;
}
- (void)closeCurrentTab:(id)sender
{
auto* current_window = [NSApp keyWindow];

3
Ladybird/AppKit/UI/LadybirdWebView.h
View file

@ -13,7 +13,8 @@
@interface LadybirdWebView : NSClipView
- (void)load:(URL const&)url;
- (void)loadURL:(URL const&)url;
- (void)loadHTML:(StringView)html url:(URL const&)url;
- (void)handleResize;
- (void)handleScroll;

9
Ladybird/AppKit/UI/LadybirdWebView.mm
View file

@ -100,11 +100,16 @@ struct HideCursor {
#pragma mark - Public methods
- (void)load:(URL const&)url
- (void)loadURL:(URL const&)url
{
m_web_view_bridge->load(url);
}
- (void)loadHTML:(StringView)html url:(URL const&)url
{
m_web_view_bridge->load_html(html, url);
}
- (void)handleResize
{
[self updateViewportRect:Ladybird::WebViewBridge::ForResize::Yes];
@ -364,7 +369,7 @@ struct HideCursor {
fromTab:[self tab]
activateTab:Web::HTML::ActivateTab::Yes];
} else {
[[self tabController] load:url];
[[self tabController] loadURL:url];
}
};

5
Ladybird/AppKit/UI/TabController.h
View file

@ -13,9 +13,10 @@
@interface TabController : NSWindowController <NSWindowDelegate>
- (instancetype)init:(URL)url;
- (instancetype)init;
- (void)load:(URL const&)url;
- (void)loadURL:(URL const&)url;
- (void)loadHTML:(StringView)html url:(URL const&)url;
- (void)onLoadStart:(URL const&)url isRedirect:(BOOL)isRedirect;
- (void)onTitleChange:(DeprecatedString const&)title;

23
Ladybird/AppKit/UI/TabController.mm
View file

@ -32,7 +32,6 @@ enum class IsHistoryNavigation {
@interface TabController () <NSToolbarDelegate, NSSearchFieldDelegate>
{
URL m_url;
DeprecatedString m_title;
Browser::History m_history;
@ -63,7 +62,7 @@ enum class IsHistoryNavigation {
@synthesize new_tab_toolbar_item = _new_tab_toolbar_item;
@synthesize tab_overview_toolbar_item = _tab_overview_toolbar_item;
- (instancetype)init:(URL)url
- (instancetype)init
{
if (self = [super init]) {
self.toolbar = [[NSToolbar alloc] initWithIdentifier:TOOLBAR_IDENTIFIER];
@ -72,7 +71,6 @@ enum class IsHistoryNavigation {
[self.toolbar setAllowsUserCustomization:NO];
[self.toolbar setSizeMode:NSToolbarSizeModeRegular];
m_url = move(url);
m_is_history_navigation = IsHistoryNavigation::No;
}
@ -81,9 +79,14 @@ enum class IsHistoryNavigation {
#pragma mark - Public methods
- (void)load:(URL const&)url
- (void)loadURL:(URL const&)url
{
[[self tab].web_view load:url];
[[self tab].web_view loadURL:url];
}
- (void)loadHTML:(StringView)html url:(URL const&)url
{
[[self tab].web_view loadHTML:html url:url];
}
- (void)onLoadStart:(URL const&)url isRedirect:(BOOL)isRedirect
@ -121,7 +124,7 @@ enum class IsHistoryNavigation {
m_history.go_back();
auto url = m_history.current().url;
[self load:url];
[self loadURL:url];
}
- (void)navigateForward:(id)sender
@ -134,7 +137,7 @@ enum class IsHistoryNavigation {
m_history.go_forward();
auto url = m_history.current().url;
[self load:url];
[self loadURL:url];
}
- (void)reload:(id)sender
@ -146,7 +149,7 @@ enum class IsHistoryNavigation {
m_is_history_navigation = IsHistoryNavigation::Yes;
auto url = m_history.current().url;
[self load:url];
[self loadURL:url];
}
- (void)clearHistory
@ -312,8 +315,6 @@ enum class IsHistoryNavigation {
- (IBAction)showWindow:(id)sender
{
self.window = [[Tab alloc] init];
[self load:m_url];
[self.window setDelegate:self];
[self.window setToolbar:self.toolbar];
@ -397,7 +398,7 @@ enum class IsHistoryNavigation {
auto* url_string = [[text_view textStorage] string];
auto url = Ladybird::sanitize_url(url_string);
[self load:url];
[self loadURL:url];
[self.window makeFirstResponder:nil];
return YES;