RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:18:13 +00:00
Code Issues Activity Actions

Browser+Ladybird+LibWebView: Consolidate title handling in LibWebView

Browse source 
Namely, let's have empty titles behave the same in both Browser and
Ladybird (display the URL).
This commit is contained in:
Timothy Flynn 2023-06-07 16:37:30 -04:00 • committed by Andreas Kling
parent f2a28e83de
commit 5a3825b561
3 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ladybird/BrowserWindow.cpp
View file

@ -516,15 +516,9 @@ int BrowserWindow::tab_index(Tab* tab)
void BrowserWindow::tab_title_changed(int index, QString const& title) void BrowserWindow::tab_title_changed(int index, QString const& title)
{ {
if (title.isEmpty()) { m_tabs_container->setTabText(index, title);
m_tabs_container->setTabText(index, "..."); if (m_tabs_container->currentIndex() == index)
if (m_tabs_container->currentIndex() == index) setWindowTitle(QString("%1 - Ladybird").arg(title));
setWindowTitle("Ladybird");
} else {
m_tabs_container->setTabText(index, title);
if (m_tabs_container->currentIndex() == index)
setWindowTitle(QString("%1 - Ladybird").arg(title));
}
} }
void BrowserWindow::tab_favicon_changed(int index, QIcon icon) void BrowserWindow::tab_favicon_changed(int index, QIcon icon)

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

@ -428,14 +428,10 @@ Tab::Tab(BrowserWindow& window)
view().on_link_click(href, "_blank", 0); view().on_link_click(href, "_blank", 0);
}; };
view().on_title_change = [this](auto& title) { view().on_title_change = [this](auto const& title) {
if (title.is_null()) { m_history.update_title(title);
m_history.update_title(url().to_deprecated_string()); m_title = title;
m_title = url().to_deprecated_string();
} else {
m_history.update_title(title);
m_title = title;
}
if (on_title_change) if (on_title_change)
on_title_change(m_title); on_title_change(m_title);
}; };

7
Userland/Libraries/LibWebView/WebContentClient.cpp
View file

@ -95,7 +95,12 @@ void WebContentClient::did_change_title(DeprecatedString const& title)
{ {
dbgln_if(SPAM_DEBUG, "handle: WebContentClient::DidChangeTitle! title={}", title); dbgln_if(SPAM_DEBUG, "handle: WebContentClient::DidChangeTitle! title={}", title);
if (m_view.on_title_change) if (!m_view.on_title_change)
return;
if (title.is_empty())
m_view.on_title_change(m_view.url().to_deprecated_string());
else
m_view.on_title_change(title); m_view.on_title_change(title);
} }