changeset 3224:0e1d0ef5ed99 trunk

bring back fileinfopopup
author Tomasz Mon <desowin@gmail.com>
date Thu, 02 Aug 2007 17:18:04 +0200
parents 963dfcfdc851
children 939a44cae771
files src/audacious/ui_playlist.c src/audacious/ui_skinned_playlist.c
diffstat 2 files changed, 4 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/ui_playlist.c	Thu Aug 02 16:51:17 2007 +0200
+++ b/src/audacious/ui_playlist.c	Thu Aug 02 17:18:04 2007 +0200
@@ -724,22 +724,6 @@
 }
 
 static void
-playlistwin_enter(GtkWidget * widget,
-                   GdkEventMotion * event,
-                   gpointer callback_data)
-{
-    UI_SKINNED_PLAYLIST(playlistwin_list)->tooltips = TRUE;
-}
-
-static void
-playlistwin_leave(GtkWidget * widget,
-                   GdkEventMotion * event,
-                   gpointer callback_data)
-{
-    UI_SKINNED_PLAYLIST(playlistwin_list)->tooltips = FALSE;
-}
-
-static void
 playlistwin_show_filebrowser(void)
 {
     run_filebrowser(NO_PLAY_BUTTON);
@@ -1596,10 +1580,6 @@
                      G_CALLBACK(playlistwin_scrolled), NULL);
     g_signal_connect(playlistwin, "motion_notify_event",
                      G_CALLBACK(playlistwin_motion), NULL);
-    g_signal_connect(playlistwin, "enter_notify_event",
-                     G_CALLBACK(playlistwin_enter), NULL);
-    g_signal_connect(playlistwin, "leave_notify_event",
-                     G_CALLBACK(playlistwin_leave), NULL);
 
     bmp_drag_dest_set(playlistwin);
 
@@ -2033,8 +2013,7 @@
     if (win == NULL
         || cfg.show_filepopup_for_tuple == FALSE
         || UI_SKINNED_PLAYLIST(playlistwin_list)->tooltips == FALSE
-        || pos != prev_pos
-        || win != GDK_WINDOW(playlistwin->window))
+        || pos != prev_pos)
     {
         prev_pos = pos;
         ctr = 0;
--- a/src/audacious/ui_skinned_playlist.c	Thu Aug 02 16:51:17 2007 +0200
+++ b/src/audacious/ui_skinned_playlist.c	Thu Aug 02 17:18:04 2007 +0200
@@ -153,6 +153,7 @@
     playlist->prev_selected = -1;
     playlist->prev_min = -1;
     playlist->prev_max = -1;
+    playlist->tooltips = TRUE;
 }
 
 GtkWidget* ui_skinned_playlist_new(GtkWidget *fixed, gint x, gint y, gint w, gint h) {
@@ -796,6 +797,7 @@
     if (nr == -1)
         return FALSE;
 
+    pl->tooltips = FALSE;
     if (event->button == 3) {
         GList* selection = playlist_get_selected(playlist);
         if (g_list_find(selection, GINT_TO_POINTER(nr)) == NULL) {
@@ -856,6 +858,7 @@
         priv->dragging = FALSE;
         priv->auto_drag_down = FALSE;
         priv->auto_drag_up = FALSE;
+        UI_SKINNED_PLAYLIST(widget)->tooltips = TRUE;
         gtk_widget_queue_draw(widget);
     }
     return TRUE;