Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add icon-size option #179

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add icon-size option #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions data/lightdm-gtk-greeter.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# Appearance:
# theme-name = GTK theme to use
# icon-theme-name = Icon theme to use
# icon-size = Icon size to use
# cursor-theme-name = Cursor theme to use
# cursor-theme-size = Cursor size to use
# background = Background file to use, either an image path or a color (e.g. #772953)
Expand Down Expand Up @@ -61,6 +62,7 @@
#user-background=
#theme-name=
#icon-theme-name=
#icon-size=
#font-name=
#xft-antialias=
#xft-dpi=
Expand Down
1 change: 1 addition & 0 deletions src/greeterconfiguration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#define CONFIG_KEY_SCREENSAVER_TIMEOUT "screensaver-timeout"
#define CONFIG_KEY_THEME "theme-name"
#define CONFIG_KEY_ICON_THEME "icon-theme-name"
#define CONFIG_KEY_ICON_SIZE "icon-size"
#define CONFIG_KEY_CURSOR_THEME "cursor-theme-name"
#define CONFIG_KEY_CURSOR_THEME_SIZE "cursor-theme-size"
#define CONFIG_KEY_FONT "font-name"
Expand Down
16 changes: 8 additions & 8 deletions src/lightdm-gtk-greeter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,9 +1051,9 @@ set_session (const gchar *session)
gchar* icon_name = g_strdup_printf ("%s_badge-symbolic", session_name);
g_free (session_name);
if (gtk_icon_theme_has_icon (icon_theme, icon_name))
gtk_image_set_from_icon_name (GTK_IMAGE (session_badge), icon_name, GTK_ICON_SIZE_MENU);
gtk_image_set_from_icon_name (GTK_IMAGE (session_badge), icon_name, config_get_int (NULL, CONFIG_KEY_ICON_SIZE, GTK_ICON_SIZE_MENU));
else
gtk_image_set_from_icon_name (GTK_IMAGE (session_badge), "document-properties-symbolic", GTK_ICON_SIZE_MENU);
gtk_image_set_from_icon_name (GTK_IMAGE (session_badge), "document-properties-symbolic", config_get_int (NULL, CONFIG_KEY_ICON_SIZE, GTK_ICON_SIZE_MENU));
g_free (icon_name);
break;
}
Expand Down Expand Up @@ -3177,9 +3177,9 @@ main (int argc, char **argv)
GSList *sessions = NULL;

if (gtk_icon_theme_has_icon (icon_theme, "document-properties-symbolic"))
session_badge = gtk_image_new_from_icon_name ("document-properties-symbolic", GTK_ICON_SIZE_MENU);
session_badge = gtk_image_new_from_icon_name ("document-properties-symbolic", config_get_int (NULL, CONFIG_KEY_ICON_SIZE, GTK_ICON_SIZE_MENU));
else
session_badge = gtk_image_new_from_icon_name ("document-properties", GTK_ICON_SIZE_MENU);
session_badge = gtk_image_new_from_icon_name ("document-properties", config_get_int (NULL, CONFIG_KEY_ICON_SIZE, GTK_ICON_SIZE_MENU));
gtk_widget_show (session_badge);
gtk_container_add (GTK_CONTAINER (session_menuitem), session_badge);

Expand Down Expand Up @@ -3241,9 +3241,9 @@ main (int argc, char **argv)
if (gtk_widget_get_visible (a11y_menuitem))
{
if (gtk_icon_theme_has_icon (icon_theme, "preferences-desktop-accessibility-symbolic"))
image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility-symbolic", GTK_ICON_SIZE_MENU);
image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility-symbolic", config_get_int (NULL, CONFIG_KEY_ICON_SIZE, GTK_ICON_SIZE_MENU));
else
image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_MENU);
image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", config_get_int (NULL, CONFIG_KEY_ICON_SIZE, GTK_ICON_SIZE_MENU));
gtk_widget_show (image);
gtk_container_add (GTK_CONTAINER (a11y_menuitem), image);
}
Expand All @@ -3270,9 +3270,9 @@ main (int argc, char **argv)
if (gtk_widget_get_visible (power_menuitem))
{
if (gtk_icon_theme_has_icon (icon_theme, "system-shutdown-symbolic"))
image = gtk_image_new_from_icon_name ("system-shutdown-symbolic", GTK_ICON_SIZE_MENU);
image = gtk_image_new_from_icon_name ("system-shutdown-symbolic", config_get_int (NULL, CONFIG_KEY_ICON_SIZE, GTK_ICON_SIZE_MENU));
else
image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_MENU);
image = gtk_image_new_from_icon_name ("system-shutdown", config_get_int (NULL, CONFIG_KEY_ICON_SIZE, GTK_ICON_SIZE_MENU));
gtk_widget_show (image);
gtk_container_add (GTK_CONTAINER (power_menuitem), image);

Expand Down