[Galago-commits] r2762 - in trunk/notification-daemon: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-21 17:20:29 -0700 (Fri, 21 Apr 2006)
New Revision: 2762

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/NEWS
   trunk/notification-daemon/src/daemon.c
Log:
Fix the scaling of different icon sizes. I was using a MAX when I should have used a MIN. Now small icons display as small, and larger icons are scaled down to 48x48.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2006-04-21 23:43:36 UTC (rev 2761)
+++ trunk/notification-daemon/ChangeLog	2006-04-22 00:20:29 UTC (rev 2762)
@@ -1,3 +1,10 @@
+Fri Apr 21 17:17:40 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/daemon.c:
+	  - Fix the scaling of different icon sizes. I was using a MAX when
+	    I should have used a MIN. Now small icons display as small, and
+	    larger icons are scaled down to 48x48.
+
 Fri Apr 21 16:42:46 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/daemon.c:

Modified: trunk/notification-daemon/NEWS
===================================================================
--- trunk/notification-daemon/NEWS	2006-04-21 23:43:36 UTC (rev 2761)
+++ trunk/notification-daemon/NEWS	2006-04-22 00:20:29 UTC (rev 2762)
@@ -5,6 +5,10 @@
 	  theme).
 	* Disabled the Bubble theme for this release. It's the source of too
 	  many bugs.
+	* Fix the scaling of different icon sizes. Now small icons display as
+	  small, and larger icons are scaled down to 48x48.
+	* Fixed a problem where icons were being clipped in notifications.
+	  Patch by M.S. (Bug #21)
 	* Fixed incorrect usage of GtkIconTheme. (Bug #38)
 	* Fixed notifications with a timeout of 2147484ms or longer expiring
 	  in less than a second. (Bug #22)

Modified: trunk/notification-daemon/src/daemon.c
===================================================================
--- trunk/notification-daemon/src/daemon.c	2006-04-21 23:43:36 UTC (rev 2761)
+++ trunk/notification-daemon/src/daemon.c	2006-04-22 00:20:29 UTC (rev 2762)
@@ -937,7 +937,7 @@
 			{
 				pixbuf = gtk_icon_theme_load_icon(
 					theme, icon,
-					MAX(IMAGE_SIZE, gtk_icon_info_get_base_size(icon_info)),
+					MIN(IMAGE_SIZE, gtk_icon_info_get_base_size(icon_info)),
 					GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
 
 				gtk_icon_info_free(icon_info);