|
 |
bbd9bfd |
diff -up gdm-2.24.0/gui/simple-greeter/gdm-user-chooser-widget.c.fix-icon-scale gdm-2.24.0/gui/simple-greeter/gdm-user-chooser-widget.c
|
|
|
bbd9bfd |
--- gdm-2.24.0/gui/simple-greeter/gdm-user-chooser-widget.c.fix-icon-scale 2008-09-22 13:01:21.000000000 -0400
|
|
|
bbd9bfd |
+++ gdm-2.24.0/gui/simple-greeter/gdm-user-chooser-widget.c 2008-09-30 17:31:00.000000000 -0400
|
|
|
bbd9bfd |
@@ -51,7 +51,7 @@ enum {
|
|
|
bbd9bfd |
|
|
|
bbd9bfd |
#define GDM_USER_CHOOSER_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_USER_CHOOSER_WIDGET, GdmUserChooserWidgetPrivate))
|
|
|
bbd9bfd |
|
|
|
bbd9bfd |
-#define ICON_SIZE 96
|
|
|
bbd9bfd |
+#define MAX_ICON_SIZE 128
|
|
|
bbd9bfd |
|
|
|
bbd9bfd |
struct GdmUserChooserWidgetPrivate
|
|
|
bbd9bfd |
{
|
|
|
bbd9bfd |
@@ -83,6 +83,45 @@ static void gdm_user_chooser_widget_
|
|
|
bbd9bfd |
|
|
|
bbd9bfd |
G_DEFINE_TYPE (GdmUserChooserWidget, gdm_user_chooser_widget, GDM_TYPE_CHOOSER_WIDGET)
|
|
|
bbd9bfd |
|
|
|
bbd9bfd |
+static int
|
|
|
bbd9bfd |
+get_font_height_for_widget (GtkWidget *widget)
|
|
|
bbd9bfd |
+{
|
|
|
bbd9bfd |
+ PangoFontMetrics *metrics;
|
|
|
bbd9bfd |
+ PangoContext *context;
|
|
|
bbd9bfd |
+ int ascent;
|
|
|
bbd9bfd |
+ int descent;
|
|
|
bbd9bfd |
+ int height;
|
|
|
bbd9bfd |
+
|
|
|
bbd9bfd |
+ gtk_widget_ensure_style (widget);
|
|
|
bbd9bfd |
+ context = gtk_widget_get_pango_context (widget);
|
|
|
bbd9bfd |
+ metrics = pango_context_get_metrics (context,
|
|
|
bbd9bfd |
+ widget->style->font_desc,
|
|
|
bbd9bfd |
+ pango_context_get_language (context));
|
|
|
bbd9bfd |
+
|
|
|
bbd9bfd |
+ ascent = pango_font_metrics_get_ascent (metrics);
|
|
|
bbd9bfd |
+ descent = pango_font_metrics_get_descent (metrics);
|
|
|
bbd9bfd |
+ height = PANGO_PIXELS (ascent + descent);
|
|
|
bbd9bfd |
+ pango_font_metrics_unref (metrics);
|
|
|
bbd9bfd |
+ return height;
|
|
|
bbd9bfd |
+}
|
|
|
bbd9bfd |
+
|
|
|
bbd9bfd |
+static int
|
|
|
bbd9bfd |
+get_icon_height_for_widget (GtkWidget *widget)
|
|
|
bbd9bfd |
+{
|
|
|
bbd9bfd |
+ int font_height;
|
|
|
bbd9bfd |
+ int height;
|
|
|
bbd9bfd |
+
|
|
|
bbd9bfd |
+ font_height = get_font_height_for_widget (widget);
|
|
|
bbd9bfd |
+ height = 3 * font_height;
|
|
|
bbd9bfd |
+ if (height > MAX_ICON_SIZE) {
|
|
|
bbd9bfd |
+ height = MAX_ICON_SIZE;
|
|
|
bbd9bfd |
+ }
|
|
|
bbd9bfd |
+
|
|
|
bbd9bfd |
+ g_debug ("GdmUserChooserWidget: font height %d; using icon size %d", font_height, height);
|
|
|
bbd9bfd |
+
|
|
|
bbd9bfd |
+ return height;
|
|
|
bbd9bfd |
+}
|
|
|
bbd9bfd |
+
|
|
|
bbd9bfd |
static void
|
|
|
bbd9bfd |
add_user_other (GdmUserChooserWidget *widget)
|
|
|
bbd9bfd |
{
|
|
|
bbd9bfd |
@@ -295,12 +334,14 @@ add_user (GdmUserChooserWidget *widget,
|
|
|
bbd9bfd |
GdkPixbuf *pixbuf;
|
|
|
bbd9bfd |
char *tooltip;
|
|
|
bbd9bfd |
gboolean is_logged_in;
|
|
|
bbd9bfd |
+ int size;
|
|
|
bbd9bfd |
|
|
|
bbd9bfd |
if (!widget->priv->show_normal_users) {
|
|
|
bbd9bfd |
return;
|
|
|
bbd9bfd |
}
|
|
|
bbd9bfd |
|
|
|
bbd9bfd |
- pixbuf = gdm_user_render_icon (user, ICON_SIZE);
|
|
|
bbd9bfd |
+ size = get_icon_height_for_widget (widget);
|
|
|
bbd9bfd |
+ pixbuf = gdm_user_render_icon (user, size);
|
|
|
bbd9bfd |
if (pixbuf == NULL && widget->priv->stock_person_pixbuf != NULL) {
|
|
|
bbd9bfd |
pixbuf = g_object_ref (widget->priv->stock_person_pixbuf);
|
|
|
bbd9bfd |
}
|
|
|
bbd9bfd |
@@ -537,10 +578,13 @@ static GdkPixbuf *
|
|
|
bbd9bfd |
get_stock_person_pixbuf (GdmUserChooserWidget *widget)
|
|
|
bbd9bfd |
{
|
|
|
bbd9bfd |
GdkPixbuf *pixbuf;
|
|
|
bbd9bfd |
+ int size;
|
|
|
bbd9bfd |
+
|
|
|
bbd9bfd |
+ size = get_icon_height_for_widget (widget);
|
|
|
bbd9bfd |
|
|
|
bbd9bfd |
pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
|
|
|
bbd9bfd |
DEFAULT_USER_ICON,
|
|
|
bbd9bfd |
- ICON_SIZE,
|
|
|
bbd9bfd |
+ size,
|
|
|
bbd9bfd |
0,
|
|
|
bbd9bfd |
NULL);
|
|
|
bbd9bfd |
|
|
|
bbd9bfd |
@@ -551,10 +595,13 @@ static GdkPixbuf *
|
|
|
bbd9bfd |
get_logged_in_pixbuf (GdmUserChooserWidget *widget)
|
|
|
bbd9bfd |
{
|
|
|
bbd9bfd |
GdkPixbuf *pixbuf;
|
|
|
bbd9bfd |
+ int size;
|
|
|
bbd9bfd |
+
|
|
|
bbd9bfd |
+ size = get_icon_height_for_widget (widget);
|
|
|
bbd9bfd |
|
|
|
bbd9bfd |
pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
|
|
|
bbd9bfd |
"emblem-default",
|
|
|
bbd9bfd |
- ICON_SIZE / 3,
|
|
|
bbd9bfd |
+ size / 3,
|
|
|
bbd9bfd |
0,
|
|
|
bbd9bfd |
NULL);
|
|
|
bbd9bfd |
|