[Goodies-commits] r7531 - xfce4-weather-plugin/trunk/panel-plugin

[Colin Leroy]

Author: colin
Date: 2009-06-11 17:16:37 +0000 (Thu, 11 Jun 2009)
New Revision: 7531

Modified:
   xfce4-weather-plugin/trunk/panel-plugin/weather.c
Log:
Make the font size logic easier on horizontal panels.


Modified: xfce4-weather-plugin/trunk/panel-plugin/weather.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather.c	2009-06-11 16:07:24 UTC (rev 7530)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather.c	2009-06-11 17:16:37 UTC (rev 7531)
@@ -138,10 +138,9 @@
 
   /* arbitrary, choose something that works */
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    size += 24;
-
-  if (size > 36)
     txtsize = "medium";
+  else if (size > 36)
+    txtsize = "medium";
   else if (size > 30)
     txtsize = "small";
   else if (size > 24)
@@ -207,10 +206,9 @@
   /* arbitrary, choose something that works */
 
   if (data->orientation == GTK_ORIENTATION_HORIZONTAL)
-    size += 24;
-
-  if (size > 36)
     txtsize = "medium";
+  else if (size > 36)
+    txtsize = "medium";
   else if (size > 30)
     txtsize = "small";
   else if (size > 24)