Revert "Add tooltips to the server buttons."

This reverts commit 7904736.
IohannRabeson · Aug 5, 2023 · a84db88 · a84db88
1 parent 01e89a8
commit a84db88
Showing 1 changed file with 22 additions and 44 deletions.
diff --git a/teamwork-launcher/src/ui/main.rs b/teamwork-launcher/src/ui/main.rs
@@ -11,9 +11,9 @@ use {
         icons,
         ui::{
             self,
-            buttons::{svg_button},
+            buttons::{favorite_button, svg_button},
             styles::BoxContainerStyle,
-            widgets::{self, ping, region, thumbnail, tooltip},
+            widgets::{self, ping, region, thumbnail},
             THUMBNAIL_CONTENT_FIT,
         },
     },
@@ -28,7 +28,6 @@ use {
     },
 };
 use crate::ui::widgets::spinner;
-use crate::ui::buttons;
 
 pub struct ViewContext<'l> {
     pub panes: &'l pane_grid::State<PaneView>,
@@ -80,54 +79,29 @@ pub fn view(context: ViewContext) -> Element<Message> {
     main_column.spacing(4).into()
 }
 
-const BUTTON_SIZE: u16 = 20;
-
-fn details_button(server: &Server) -> Element<Message> {
-    tooltip(svg_button(icons::INFO_ICON.clone(), BUTTON_SIZE)
-            .on_press(Message::ShowServer(server.ip_port.clone(), server.map.clone())),
-            "Show details", iced::widget::tooltip::Position::Bottom)
-}
-
-fn favorite_button(server: &Server, is_bookmarked: bool) -> Element<Message> {
-    tooltip(buttons::favorite_button(is_bookmarked, BUTTON_SIZE)
-                .on_press(Message::Bookmarked(server.ip_port.clone(), !is_bookmarked)),
-            "Add / remove from favorites", iced::widget::tooltip::Position::Bottom)
-}
-
-fn copy_connection_string_button(server: &Server) -> Element<Message> {
-    tooltip(svg_button(icons::COPY_ICON.clone(), BUTTON_SIZE)
-                .on_press(Message::CopyConnectionString(server.ip_port.clone())),
-            "Copy the connection string to the clipboard", iced::widget::tooltip::Position::Bottom)
-}
-
-fn refresh_server_button(server: &Server) -> Element<Message> {
-    tooltip(svg_button(icons::REFRESH_ICON.clone(), BUTTON_SIZE)
-                .on_press(Message::RefreshServer(server.ip_port.clone())),
-            "Refresh server information", iced::widget::tooltip::Position::Bottom)
-}
-
-fn start_game_button(server: &Server) -> Element<Message> {
-    tooltip(svg_button(icons::PLAY_ICON.clone(), BUTTON_SIZE).on_press(Message::LaunchGame(server.ip_port.clone())),
-            "Start Team Fortress 2", iced::widget::tooltip::Position::Bottom)
-}
-
 /// The wide view that displays server information.
 fn server_view<'l>(server: &'l Server, bookmarks: &'l Bookmarks, game_modes: &'l GameModes) -> Element<'l, Message> {
     let is_bookmarked = bookmarks.is_bookmarked(&server.ip_port);
     let ip_port_text = format!("{}:{}", server.ip_port.ip(), server.ip_port.port());
     let game_modes = widgets::game_modes(game_modes, &server.game_modes);
 
+    const BUTTON_SIZE: u16 = 20;
+
     container(
         row![
             thumbnail(server, Length::Fixed(250.0), Length::Fixed(125.0)),
             column![
                 row![
                     text(&server.name).size(28).width(Length::Fill),
-                    details_button(server),
-                    favorite_button(server, is_bookmarked),
-                    copy_connection_string_button(server),
-                    refresh_server_button(server),
-                    start_game_button(server),
+                    svg_button(icons::INFO_ICON.clone(), BUTTON_SIZE)
+                        .on_press(Message::ShowServer(server.ip_port.clone(), server.map.clone())),
+                    favorite_button(is_bookmarked, BUTTON_SIZE)
+                        .on_press(Message::Bookmarked(server.ip_port.clone(), !is_bookmarked)),
+                    svg_button(icons::COPY_ICON.clone(), BUTTON_SIZE)
+                        .on_press(Message::CopyConnectionString(server.ip_port.clone())),
+                    svg_button(icons::REFRESH_ICON.clone(), BUTTON_SIZE)
+                        .on_press(Message::RefreshServer(server.ip_port.clone())),
+                    svg_button(icons::PLAY_ICON.clone(), BUTTON_SIZE).on_press(Message::LaunchGame(server.ip_port.clone())),
                 ]
                 .padding(4)
                 .spacing(4),
@@ -193,11 +167,15 @@ fn compact_server_view<'l>(server: &'l Server, bookmarks: &'l Bookmarks, game_mo
             row![
                 thumbnail,
                 column![
-                    details_button(server),
-                    favorite_button(server, is_bookmarked),
-                    copy_connection_string_button(server),
-                    refresh_server_button(server),
-                    start_game_button(server),
+                    svg_button(icons::INFO_ICON.clone(), BUTTON_SIZE)
+                        .on_press(Message::ShowServer(server.ip_port.clone(), server.map.clone())),
+                    favorite_button(is_bookmarked, BUTTON_SIZE)
+                        .on_press(Message::Bookmarked(server.ip_port.clone(), !is_bookmarked)),
+                    svg_button(icons::COPY_ICON.clone(), BUTTON_SIZE)
+                        .on_press(Message::CopyConnectionString(server.ip_port.clone())),
+                    svg_button(icons::REFRESH_ICON.clone(), BUTTON_SIZE)
+                        .on_press(Message::RefreshServer(server.ip_port.clone())),
+                    svg_button(icons::PLAY_ICON.clone(), BUTTON_SIZE).on_press(Message::LaunchGame(server.ip_port.clone())),
                 ]
                 .spacing(4)
             ]