changeset 1300:a5c4e748d557 trunk

[svn] - don't call filepopup_show_for_tuple() more than once
author nenolod
date Sun, 18 Jun 2006 22:28:47 -0700
parents ead95abdf9bc
children 0b0e00851054
files ChangeLog audacious/ui_fileinfo.c
diffstat 2 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jun 18 22:14:56 2006 -0700
+++ b/ChangeLog	Sun Jun 18 22:28:47 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-19 05:14:56 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1510]
+  - downsize images larger than 150px
+  
+
+  Changes:        Modified:
+  +28 -2          trunk/audacious/ui_fileinfo.c  
+
+
 2006-06-19 04:52:46 +0000  Derek Pomery <nemo@m8y.org>
   revision [1508]
   nitpicks, whee! just so I can see the popup when snapped against screen edge.
--- a/audacious/ui_fileinfo.c	Sun Jun 18 22:14:56 2006 -0700
+++ b/audacious/ui_fileinfo.c	Sun Jun 18 22:28:47 2006 -0700
@@ -178,6 +178,7 @@
 	gint x, y, x_off = 3, y_off = 3, h, w, pos;
 	TitleInput *tuple;
 	static gint prev_x = 0, prev_y = 0, ctr = 0;
+	gboolean skip = FALSE;
 
 	if (playlistwin_is_shaded() || playlistwin_list->pl_tooltips == FALSE)
 	{
@@ -198,7 +199,10 @@
 		return TRUE;
 	}
 
-        if (ctr >= 20)
+	if (filepopup_win->window == NULL)
+		skip = TRUE;
+
+        if (ctr >= 20 && (skip == TRUE || gdk_window_is_viewable(GDK_WINDOW(filepopup_win->window)) != TRUE))
         {
 		pos = playlist_list_get_playlist_position(playlistwin_list, x, y);