RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 22:07:34 +00:00
Code Issues Activity Actions

LibGUI+Userland: Port TabWidget set_tab_title to new string

Browse source
This commit is contained in:
Karol Kosek 2023-03-10 20:25:41 +01:00 • committed by Andreas Kling
parent 4f08a05a3b
commit 66402b0666
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/Browser/BrowserWindow.cpp
View file

@ -572,7 +572,7 @@ void BrowserWindow::create_new_tab(URL url, bool activate)
m_tab_widget->set_bar_visible(!is_fullscreen() && m_tab_widget->children().size() > 1); m_tab_widget->set_bar_visible(!is_fullscreen() && m_tab_widget->children().size() > 1);
new_tab.on_title_change = [this, &new_tab](auto& title) { new_tab.on_title_change = [this, &new_tab](auto& title) {
m_tab_widget->set_tab_title(new_tab, title); m_tab_widget->set_tab_title(new_tab, String::from_deprecated_string(title).release_value_but_fixme_should_propagate_errors());
if (m_tab_widget->active_widget() == &new_tab) if (m_tab_widget->active_widget() == &new_tab)
set_window_title_for_tab(new_tab); set_window_title_for_tab(new_tab);
}; };

2
Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp
View file

@ -104,7 +104,7 @@ SpreadsheetWidget::SpreadsheetWidget(GUI::Window& parent_window, Vector<NonnullR
if (GUI::InputBox::show(window(), new_name, DeprecatedString::formatted("New name for '{}'", sheet.name()), "Rename sheet"sv) == GUI::Dialog::ExecResult::OK) { if (GUI::InputBox::show(window(), new_name, DeprecatedString::formatted("New name for '{}'", sheet.name()), "Rename sheet"sv) == GUI::Dialog::ExecResult::OK) {
sheet.set_name(new_name); sheet.set_name(new_name);
sheet.update(); sheet.update();
m_tab_widget->set_tab_title(static_cast<GUI::Widget&>(*m_tab_context_menu_sheet_view), new_name); m_tab_widget->set_tab_title(static_cast<GUI::Widget&>(*m_tab_context_menu_sheet_view), String::from_deprecated_string(new_name).release_value_but_fixme_should_propagate_errors());
} }
}); });
m_tab_context_menu->add_action(*m_rename_action); m_tab_context_menu->add_action(*m_rename_action);

2
Userland/DevTools/HackStudio/HackStudioWidget.cpp
View file

@ -1714,7 +1714,7 @@ void HackStudioWidget::update_window_title()
void HackStudioWidget::update_current_editor_title() void HackStudioWidget::update_current_editor_title()
{ {
current_editor_tab_widget().set_tab_title(current_editor_wrapper(), current_editor_wrapper().filename_title()); current_editor_tab_widget().set_tab_title(current_editor_wrapper(), String::from_deprecated_string(current_editor_wrapper().filename_title()).release_value_but_fixme_should_propagate_errors());
} }
void HackStudioWidget::on_cursor_change() void HackStudioWidget::on_cursor_change()

2
Userland/DevTools/SQLStudio/ScriptEditor.cpp
View file

@ -72,7 +72,7 @@ ErrorOr<bool> ScriptEditor::save_as()
auto parent = static_cast<GUI::TabWidget*>(parent_widget()); auto parent = static_cast<GUI::TabWidget*>(parent_widget());
if (parent) if (parent)
parent->set_tab_title(*this, lexical_path.title()); parent->set_tab_title(*this, String::from_deprecated_string(lexical_path.title()).release_value_but_fixme_should_propagate_errors());
document().set_unmodified(); document().set_unmodified();
return true; return true;

4
Userland/Libraries/LibGUI/TabWidget.cpp
View file

@ -591,12 +591,12 @@ Optional<size_t> TabWidget::active_tab_index() const
return {}; return {};
} }
void TabWidget::set_tab_title(Widget& tab, StringView title) void TabWidget::set_tab_title(Widget& tab, String title)
{ {
for (auto& t : m_tabs) { for (auto& t : m_tabs) {
if (t.widget == &tab) { if (t.widget == &tab) {
if (t.title != title) { if (t.title != title) {
t.title = String::from_utf8(title).release_value_but_fixme_should_propagate_errors(); t.title = move(title);
update(); update();
} }
return; return;

2
Userland/Libraries/LibGUI/TabWidget.h
View file

@ -83,7 +83,7 @@ public:
void remove_tab(Widget& tab) { remove_widget(tab); } void remove_tab(Widget& tab) { remove_widget(tab); }
void remove_all_tabs_except(Widget& tab); void remove_all_tabs_except(Widget& tab);
void set_tab_title(Widget& tab, StringView title); void set_tab_title(Widget& tab, String title);
void set_tab_icon(Widget& tab, Gfx::Bitmap const*); void set_tab_icon(Widget& tab, Gfx::Bitmap const*);
bool is_tab_modified(Widget& tab); bool is_tab_modified(Widget& tab);