[Gaim-commits] SF.net SVN: gaim: [16819] trunk

[<sea...@us...>]

Revision: 16819
Author:   seanegan
Date:     2006-08-17 15:42:28 -0700 (Thu, 17 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16819&view=rev

Log Message:
-----------
Patch to eggtrayicon by Dan Winship makes icon transparent

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/ChangeLog
    trunk/plugins/docklet/eggtrayicon.c
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-08-17 21:16:50 UTC (rev 16818)
+++ trunk/COPYRIGHT	2006-08-17 22:42:28 UTC (rev 16819)
@@ -317,6 +317,7 @@
 Dan Willemsen
 Jason Willis
 Matt Wilson
+Dan Winship
 Scott Wolchok
 Pui Lam Wong
 Justin Wood

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-08-17 21:16:50 UTC (rev 16818)
+++ trunk/ChangeLog	2006-08-17 22:42:28 UTC (rev 16819)
@@ -99,6 +99,7 @@
 	  removed.
 	* 'Highlight when nick said' option added to Message Notification
 	  plugin.
+	* The system tray icon is now transparent (Dan Winship)
 
 	MSN Features:
 	* Custom smiley receiving support (Irving Cordova & Francesco Fracassi)

Modified: trunk/plugins/docklet/eggtrayicon.c
===================================================================
--- trunk/plugins/docklet/eggtrayicon.c	2006-08-17 21:16:50 UTC (rev 16818)
+++ trunk/plugins/docklet/eggtrayicon.c	2006-08-17 22:42:28 UTC (rev 16819)
@@ -54,6 +54,9 @@
 static void egg_tray_icon_realize   (GtkWidget *widget);
 static void egg_tray_icon_unrealize (GtkWidget *widget);
 
+static void egg_tray_icon_add (GtkContainer *container,
+                               GtkWidget *widget);
+
 static void egg_tray_icon_update_manager_window    (EggTrayIcon *icon,
 						    gboolean     dock_if_realized);
 static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon);
@@ -109,6 +112,7 @@
 {
   GObjectClass *gobject_class = (GObjectClass *)klass;
   GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
+  GtkContainerClass *container_class = (GtkContainerClass *)klass;
 
   parent_class = g_type_class_peek_parent (klass);
 
@@ -117,6 +121,8 @@
   widget_class->realize   = egg_tray_icon_realize;
   widget_class->unrealize = egg_tray_icon_unrealize;
 
+  container_class->add = egg_tray_icon_add;
+
   g_object_class_install_property (gobject_class,
 				   PROP_ORIENTATION,
 				   g_param_spec_enum ("orientation",
@@ -374,7 +380,37 @@
   egg_tray_icon_update_manager_window (icon, TRUE);
 }
 
+static gboolean
+transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
+{
+	gdk_window_clear_area (widget->window, event->area.x, event->area.y,
+	                      event->area.width, event->area.height);
+	return FALSE;
+}
+
 static void
+make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
+                       gpointer user_data)
+{
+	gdk_window_set_back_pixmap(widget->window, NULL, TRUE);
+}
+
+static void
+make_transparent (GtkWidget *widget, gpointer user_data)
+{
+	if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
+		return;
+
+	gtk_widget_set_app_paintable (widget, TRUE);
+	gtk_widget_set_double_buffered (widget, FALSE);
+	gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+	g_signal_connect (widget, "expose_event",
+	                 G_CALLBACK (transparent_expose_event), NULL);
+	g_signal_connect_after (widget, "style_set",
+	                       G_CALLBACK (make_transparent_again), NULL);
+}
+
+static void
 egg_tray_icon_realize (GtkWidget *widget)
 {
   EggTrayIcon *icon = EGG_TRAY_ICON (widget);
@@ -386,6 +422,8 @@
   if (GTK_WIDGET_CLASS (parent_class)->realize)
     GTK_WIDGET_CLASS (parent_class)->realize (widget);
 
+  make_transparent (widget, NULL);
+
 #if GTK_CHECK_VERSION(2,1,0)
   screen = gdk_screen_get_number (gtk_widget_get_screen (widget));
   xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget));
@@ -425,6 +463,14 @@
 			 egg_tray_icon_manager_filter, icon);
 }
 
+static void
+egg_tray_icon_add (GtkContainer *container, GtkWidget *widget)
+{
+	g_signal_connect (widget, "realize",
+	                 G_CALLBACK (make_transparent), NULL);
+	GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
+}
+
 #if GTK_CHECK_VERSION(2,1,0)
 EggTrayIcon *
 egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.