From 3944c39b3a1e9bfd255084bdfc684cfb82552d11 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Wed, 23 Aug 2023 20:16:52 +0200 Subject: [PATCH] LibGUI: Port tooltip in Breadcrumbbar to String --- Userland/Applications/SpaceAnalyzer/main.cpp | 4 ++-- Userland/Libraries/LibGUI/Breadcrumbbar.cpp | 4 ++-- Userland/Libraries/LibGUI/Breadcrumbbar.h | 2 +- Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Userland/Applications/SpaceAnalyzer/main.cpp b/Userland/Applications/SpaceAnalyzer/main.cpp index 8a954e0bd1..abc94565a3 100644 --- a/Userland/Applications/SpaceAnalyzer/main.cpp +++ b/Userland/Applications/SpaceAnalyzer/main.cpp @@ -154,7 +154,7 @@ ErrorOr serenity_main(Main::Arguments arguments) if (tree_map_widget.viewpoint() == 0) window->set_title("/ - SpaceAnalyzer"); - breadcrumbbar.append_segment("/", GUI::FileIconProvider::icon_for_path("/"sv).bitmap_for_size(16), "/", "/"); + breadcrumbbar.append_segment("/", GUI::FileIconProvider::icon_for_path("/"sv).bitmap_for_size(16), "/", "/"_string); continue; } @@ -167,7 +167,7 @@ ErrorOr serenity_main(Main::Arguments arguments) if (k == tree_map_widget.viewpoint()) window->set_title(DeprecatedString::formatted("{} - SpaceAnalyzer", builder.string_view())); - breadcrumbbar.append_segment(node->name(), GUI::FileIconProvider::icon_for_path(builder.string_view()).bitmap_for_size(16), builder.string_view(), builder.string_view()); + breadcrumbbar.append_segment(node->name(), GUI::FileIconProvider::icon_for_path(builder.string_view()).bitmap_for_size(16), builder.string_view(), MUST(builder.to_string())); } breadcrumbbar.set_selected_segment(tree_map_widget.viewpoint()); }; diff --git a/Userland/Libraries/LibGUI/Breadcrumbbar.cpp b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp index a6aad8a107..9d6ccbcac5 100644 --- a/Userland/Libraries/LibGUI/Breadcrumbbar.cpp +++ b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp @@ -70,13 +70,13 @@ void Breadcrumbbar::clear_segments() m_selected_segment = {}; } -void Breadcrumbbar::append_segment(DeprecatedString text, Gfx::Bitmap const* icon, DeprecatedString data, DeprecatedString tooltip) +void Breadcrumbbar::append_segment(DeprecatedString text, Gfx::Bitmap const* icon, DeprecatedString data, String tooltip) { auto& button = add(); button.set_button_style(Gfx::ButtonStyle::Coolbar); button.set_text(String::from_deprecated_string(text).release_value_but_fixme_should_propagate_errors()); button.set_icon(icon); - button.set_tooltip_deprecated(move(tooltip)); + button.set_tooltip(move(tooltip)); button.set_focus_policy(FocusPolicy::TabFocus); button.set_checkable(true); button.set_exclusive(true); diff --git a/Userland/Libraries/LibGUI/Breadcrumbbar.h b/Userland/Libraries/LibGUI/Breadcrumbbar.h index 0a16334194..1721b3741a 100644 --- a/Userland/Libraries/LibGUI/Breadcrumbbar.h +++ b/Userland/Libraries/LibGUI/Breadcrumbbar.h @@ -19,7 +19,7 @@ public: virtual ~Breadcrumbbar() override = default; void clear_segments(); - void append_segment(DeprecatedString text, Gfx::Bitmap const* icon = nullptr, DeprecatedString data = {}, DeprecatedString tooltip = {}); + void append_segment(DeprecatedString text, Gfx::Bitmap const* icon = nullptr, DeprecatedString data = {}, String tooltip = {}); void remove_end_segments(size_t segment_index); void relayout(); diff --git a/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp b/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp index a61cc1f28e..6a82ed983a 100644 --- a/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp +++ b/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp @@ -110,7 +110,7 @@ void PathBreadcrumbbar::set_current_path(DeprecatedString const& new_path) } else { m_breadcrumbbar->clear_segments(); - m_breadcrumbbar->append_segment("/", GUI::FileIconProvider::icon_for_path("/"sv).bitmap_for_size(16), "/", "/"); + m_breadcrumbbar->append_segment("/", GUI::FileIconProvider::icon_for_path("/"sv).bitmap_for_size(16), "/", "/"_string); StringBuilder builder; for (auto& part : lexical_path.parts()) { @@ -118,7 +118,7 @@ void PathBreadcrumbbar::set_current_path(DeprecatedString const& new_path) builder.append('/'); builder.append(part); - m_breadcrumbbar->append_segment(part, GUI::FileIconProvider::icon_for_path(builder.string_view()).bitmap_for_size(16), builder.string_view(), builder.string_view()); + m_breadcrumbbar->append_segment(part, GUI::FileIconProvider::icon_for_path(builder.string_view()).bitmap_for_size(16), builder.string_view(), MUST(builder.to_string())); } m_breadcrumbbar->set_selected_segment(m_breadcrumbbar->segment_count() - 1);