From a338fe2d7b6ec9899ca061c9d9bce91c6321e152 Mon Sep 17 00:00:00 2001
From: Sebastian Lay <mail@sebastian-lay.de>
Date: Sat, 2 Aug 2025 23:28:21 +0200
Subject: [PATCH] Replace tooltip with instant popover (#29, #324, #422)

---
 data/Application.css        |  4 +++
 src/AppSystem/Launcher.vala | 50 ++++++++++++++++++++++++++++++-------
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/data/Application.css b/data/Application.css
index 4358d01d..a9caad6a 100644
--- a/data/Application.css
+++ b/data/Application.css
@@ -64,6 +64,10 @@ launcher progressbar progress {
     min-width: 0;
 }
 
+tooltip {
+    margin-bottom: 0.5em;
+}
+
 backgrounditem,
 icongroup {
     padding: 6px;
diff --git a/src/AppSystem/Launcher.vala b/src/AppSystem/Launcher.vala
index 21cdc75a..e4c30d55 100644
--- a/src/AppSystem/Launcher.vala
+++ b/src/AppSystem/Launcher.vala
@@ -4,6 +4,12 @@
  */
 
 public class Dock.Launcher : BaseItem {
+    private class PopoverTooltip : Gtk.Popover {
+        class construct {
+            set_css_name ("tooltip");
+        }
+    }
+
     private const int DND_TIMEOUT = 1000;
 
     private static Settings? notify_settings;
@@ -30,7 +36,8 @@ public class Dock.Launcher : BaseItem {
     private Gtk.Revealer badge_revealer;
     private Adw.TimedAnimation bounce_up;
     private Adw.TimedAnimation bounce_down;
-    private Gtk.PopoverMenu popover;
+    private Gtk.PopoverMenu popover_menu;
+    private Gtk.Popover popover_tooltip;
 
     private Gtk.Image? second_running_indicator;
     private bool multiple_windows_open {
@@ -63,11 +70,32 @@ public class Dock.Launcher : BaseItem {
     }
 
     construct {
-        popover = new Gtk.PopoverMenu.from_model (app.menu_model) {
+        popover_menu = new Gtk.PopoverMenu.from_model (app.menu_model) {
             autohide = true,
             position = TOP
         };
-        popover.set_parent (this);
+        popover_menu.set_parent (this);
+
+        var name_label = new Gtk.Label (app.app_info.get_display_name ());
+        popover_tooltip = new PopoverTooltip () {
+            position = TOP,
+            child = name_label,
+            autohide = false,
+            can_focus = false,
+            can_target = false,
+            focusable = false,
+            has_arrow = false
+        };
+        popover_tooltip.set_parent (this);
+
+        var motion_controller = new Gtk.EventControllerMotion ();
+        motion_controller.enter.connect (() => {
+            if (!popover_menu.visible) {
+                popover_tooltip.popup ();
+            }
+        });
+        motion_controller.leave.connect (popover_tooltip.popdown);
+        add_controller (motion_controller);
 
         image = new Gtk.Image ();
 
@@ -99,8 +127,6 @@ public class Dock.Launcher : BaseItem {
         overlay.add_overlay (badge_revealer);
         overlay.add_overlay (progress_revealer);
 
-        tooltip_text = app.app_info.get_display_name ();
-
         insert_action_group (ACTION_GROUP_PREFIX, app.action_group);
 
         // We have to destroy the progressbar when it is not needed otherwise it will
@@ -154,7 +180,10 @@ public class Dock.Launcher : BaseItem {
         gesture_click.released.connect (on_click_released);
 
         var long_press = new Gtk.GestureLongPress ();
-        long_press.pressed.connect (popover.popup);
+        long_press.pressed.connect (() => {
+            popover_menu.popup ();
+            popover_tooltip.popdown ();
+        });
         add_controller (long_press);
 
         var scroll_controller = new Gtk.EventControllerScroll (VERTICAL);
@@ -200,8 +229,10 @@ public class Dock.Launcher : BaseItem {
     }
 
     ~Launcher () {
-        popover.unparent ();
-        popover.dispose ();
+        popover_menu.unparent ();
+        popover_menu.dispose ();
+        popover_tooltip.unparent ();
+        popover_tooltip.dispose ();
     }
 
     /**
@@ -232,7 +263,8 @@ public class Dock.Launcher : BaseItem {
                 }
                 break;
             case Gdk.BUTTON_SECONDARY:
-                popover.popup ();
+                popover_menu.popup ();
+                popover_tooltip.popdown ();
                 break;
         }
     }