PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

Load theme-str after loading fallback themes. 

* If no theme loaded, try converting old theme.
 * If still no theme loaded, try default theme.
 * Then load modifications (theme-str option)
This commit is contained in:
Dave Davenport 2017-06-07 07:53:33 +02:00
parent d33edaf09d
commit 07076d154a
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/rofi.c
View File

@ -838,16 +838,10 @@ int main ( int argc, char *argv[] )
TICK_N ( "Setup Modi" );
}
const char ** theme_str = find_arg_strv ( "-theme-str" );
if ( theme_str ) {
for ( int index = 0; theme_str && theme_str[index]; index++ ) {
if ( rofi_theme_parse_string ( theme_str[index] ) ) {
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
}
}
g_free ( theme_str );
if ( rofi_theme_is_empty ( ) ) {
rofi_theme_convert_old ();
}
if ( rofi_theme_is_empty ( ) ) {
if ( rofi_theme_parse_string ( default_theme ) ) {
g_warning ( "Failed to parse default theme. Giving up.." );
@ -862,7 +856,19 @@ int main ( int argc, char *argv[] )
cleanup ();
return EXIT_FAILURE;
}
rofi_theme_convert_old ();
}
/**
* Make small commandline changes to the current theme.
*/
const char ** theme_str = find_arg_strv ( "-theme-str" );
if ( theme_str ) {
for ( int index = 0; theme_str && theme_str[index]; index++ ) {
if ( rofi_theme_parse_string ( theme_str[index] ) ) {
rofi_theme_free ( rofi_theme );
rofi_theme = NULL;
}
}
g_free ( theme_str );
}
if ( find_arg ( "-dump-theme" ) >= 0 ) {