PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00
Code Releases Activity

drun: Use Adwaita and gnome as fallback themes

Browse source 
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2017-06-07 12:38:52 +02:00
parent 07076d154a
commit 3067f67fd1
No known key found for this signature in database
GPG key ID: AC203F96E2C34BB7
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/config.c
View file

@ -60,8 +60,8 @@ Settings config = {
.run_shell_command = "{terminal} -e {cmd}", .run_shell_command = "{terminal} -e {cmd}",
/** Command executed on accep-entry-custom for window modus */ /** Command executed on accep-entry-custom for window modus */
.window_command = "xkill -id {window}", .window_command = "xkill -id {window}",
/** Sane default for an icon theme */ /** No default icon theme, we search Adwaita and gnome as fallback */
.drun_icon_theme = "gnome", .drun_icon_theme = NULL,
/** /**
* Location of the window. * Location of the window.
* Enumeration indicating location or gravity of window. * Enumeration indicating location or gravity of window.

11
source/dialogs/drun.c
View file

@ -459,11 +459,20 @@ static gpointer drun_icon_fetch ( gpointer data )
// this should be fine running in another thread. // this should be fine running in another thread.
DRunModePrivateData *pd = (DRunModePrivateData *) data; DRunModePrivateData *pd = (DRunModePrivateData *) data;
DRunModeEntry *dr; DRunModeEntry *dr;
gsize i = 0;
const gchar *themes[4];
if ( config.drun_icon_theme != NULL ) {
themes[i++] = config.drun_icon_theme;
}
themes[i++] = "Adwaita";
themes[i++] = "gnome";
themes[i] = NULL;
while ( ( dr = g_async_queue_pop ( pd->icon_fetch_queue ) ) != &( pd->quit_entry ) ) { while ( ( dr = g_async_queue_pop ( pd->icon_fetch_queue ) ) != &( pd->quit_entry ) ) {
if ( dr->icon_name == NULL ) { if ( dr->icon_name == NULL ) {
continue; continue;
} }
gchar *icon_path = nk_xdg_theme_get_icon ( pd->xdg_context, config.drun_icon_theme, "Applications", dr->icon_name, 32, 1, TRUE ); gchar *icon_path = nk_xdg_theme_get_icon ( pd->xdg_context, themes, "Applications", dr->icon_name, 32, 1, TRUE );
if ( icon_path == NULL ) { if ( icon_path == NULL ) {
g_debug ( "Failed to get Icon %s(%d): n/a", dr->icon_name, dr->icon_size ); g_debug ( "Failed to get Icon %s(%d): n/a", dr->icon_name, dr->icon_size );
continue; continue;

2
subprojects/libnkutils

@ -1 +1 @@
Subproject commit 53314c0ab58d1a677d61017a413fd1d83b05ce3c Subproject commit e66c49bb944d1c77f23e7da5277b863a5fca8d2d