Author: kelnos
Date: 2008-08-25 11:41:21 +0000 (Mon, 25 Aug 2008)
New Revision: 27568
Modified:
xfdesktop/trunk/scripts/xfdesktop-xfconf-migration.pl.in
xfdesktop/trunk/settings/main.c
xfdesktop/trunk/src/xfce-desktop-settings.c
xfdesktop/trunk/src/xfdesktop-icon-view.c
xfdesktop/trunk/src/xfdesktop-icon-view.h
Log:
use a double to store font size; some fonts have half point sizes (bug 4295)
Modified: xfdesktop/trunk/scripts/xfdesktop-xfconf-migration.pl.in
===================================================================
--- xfdesktop/trunk/scripts/xfdesktop-xfconf-migration.pl.in 2008-08-25
11:17:10 UTC (rev 27567)
+++ xfdesktop/trunk/scripts/xfdesktop-xfconf-migration.pl.in 2008-08-25
11:41:21 UTC (rev 27568)
@@ -82,7 +82,7 @@
if(defined($options{'icons_font_size'})) {
xfconf_set('/desktop-icons/font-size',
- 'uint',
+ 'double',
$options{'icons_font_size'}->{'value'});
}
Modified: xfdesktop/trunk/settings/main.c
===================================================================
--- xfdesktop/trunk/settings/main.c 2008-08-25 11:17:10 UTC (rev 27567)
+++ xfdesktop/trunk/settings/main.c 2008-08-25 11:41:21 UTC (rev 27568)
@@ -680,7 +680,7 @@
G_OBJECT(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(glade_xml_get_widget(main_gxml,
"spin_icon_size")))),
"value");
- xfconf_g_property_bind(channel, DESKTOP_ICONS_FONT_SIZE_PROP, G_TYPE_UINT,
+ xfconf_g_property_bind(channel, DESKTOP_ICONS_FONT_SIZE_PROP,
G_TYPE_DOUBLE,
G_OBJECT(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(spin_font_size))),
"value");
xfconf_g_property_bind(channel, DESKTOP_ICONS_CUSTOM_FONT_SIZE_PROP,
Modified: xfdesktop/trunk/src/xfce-desktop-settings.c
===================================================================
--- xfdesktop/trunk/src/xfce-desktop-settings.c 2008-08-25 11:17:10 UTC (rev
27567)
+++ xfdesktop/trunk/src/xfce-desktop-settings.c 2008-08-25 11:41:21 UTC (rev
27568)
@@ -247,9 +247,9 @@
));
xfce_desktop_set_icon_font_size(desktop,
- xfconf_channel_get_uint(channel,
-
"/desktop-icons/font-size",
-
DEFAULT_ICON_FONT_SIZE));
+ xfconf_channel_get_double(channel,
+
"/desktop-icons/font-size",
+
DEFAULT_ICON_FONT_SIZE));
xfce_desktop_set_icon_use_system_font_size(desktop,
!xfconf_channel_get_bool(channel,
@@ -380,7 +380,7 @@
return;
} else if(!strcmp(property, "/desktop-icons/font-size")) {
xfce_desktop_set_icon_font_size(desktop, G_VALUE_TYPE(value)
- ? g_value_get_uint(value)
+ ? g_value_get_double(value)
: DEFAULT_ICON_FONT_SIZE);
return;
}
Modified: xfdesktop/trunk/src/xfdesktop-icon-view.c
===================================================================
--- xfdesktop/trunk/src/xfdesktop-icon-view.c 2008-08-25 11:17:10 UTC (rev
27567)
+++ xfdesktop/trunk/src/xfdesktop-icon-view.c 2008-08-25 11:41:21 UTC (rev
27568)
@@ -105,7 +105,7 @@
GtkWidget *parent_window;
guint icon_size;
- guint font_size;
+ gdouble font_size;
WnckScreen *wnck_screen;
PangoLayout *playout;
@@ -283,7 +283,7 @@
gint x,
gint y);
static void xfdesktop_icon_view_modify_font_size(XfdesktopIconView *icon_view,
- gint size);
+ gdouble size);
static void xfdesktop_ird_free(XfdesktopIdleRepaintData *ird);
static void xfdesktop_icon_view_add_item_internal(XfdesktopIconView *icon_view,
XfdesktopIcon *icon);
@@ -2519,7 +2519,7 @@
static void
xfdesktop_icon_view_modify_font_size(XfdesktopIconView *icon_view,
- gint size)
+ gdouble size)
{
const PangoFontDescription *pfd;
PangoFontDescription *pfd_new;
@@ -2530,7 +2530,7 @@
else
pfd_new = pango_font_description_new();
- pango_font_description_set_size(pfd_new, size * PANGO_SCALE);
+ pango_font_description_set_size(pfd_new, (gint)(size * PANGO_SCALE));
pango_layout_set_font_description(icon_view->priv->playout, pfd_new);
@@ -2979,7 +2979,7 @@
void
xfdesktop_icon_view_set_font_size(XfdesktopIconView *icon_view,
- gint font_size_points)
+ gdouble font_size_points)
{
g_return_if_fail(XFDESKTOP_IS_ICON_VIEW(icon_view));
@@ -2995,10 +2995,10 @@
}
}
-guint
+gdouble
xfdesktop_icon_view_get_font_size(XfdesktopIconView *icon_view)
{
- g_return_val_if_fail(XFDESKTOP_IS_ICON_VIEW(icon_view), 0);
+ g_return_val_if_fail(XFDESKTOP_IS_ICON_VIEW(icon_view), 0.0);
return icon_view->priv->font_size;
}
Modified: xfdesktop/trunk/src/xfdesktop-icon-view.h
===================================================================
--- xfdesktop/trunk/src/xfdesktop-icon-view.h 2008-08-25 11:17:10 UTC (rev
27567)
+++ xfdesktop/trunk/src/xfdesktop-icon-view.h 2008-08-25 11:41:21 UTC (rev
27568)
@@ -100,8 +100,8 @@
guint xfdesktop_icon_view_get_icon_size(XfdesktopIconView *icon_view);
void xfdesktop_icon_view_set_font_size(XfdesktopIconView *icon_view,
- gint font_size_points);
-guint xfdesktop_icon_view_get_font_size(XfdesktopIconView *icon_view);
+ gdouble font_size_points);
+gdouble xfdesktop_icon_view_get_font_size(XfdesktopIconView *icon_view);
GtkWidget *xfdesktop_icon_view_get_window_widget(XfdesktopIconView *icon_view);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
