From b8747c45e3f1b88fe4d85d66fa88179f5cf5e375 Mon Sep 17 00:00:00 2001 From: trizen Date: Wed, 4 Oct 2017 22:52:49 +0300 Subject: [PATCH] - Added the `generic_fallback` config option. - Removed the `force_svg_icons` config option. When `generic_fallback` is set to a true value, obmenu-generator will pass the `generic-fallback` flag to `Gtk2::IconLookupFlags`, which will try to shorten icon names at '-' characters before looking at inherited themes. --- obmenu-generator | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/obmenu-generator b/obmenu-generator index 633b1f5..a2a7a2e 100755 --- a/obmenu-generator +++ b/obmenu-generator @@ -24,10 +24,11 @@ # Name: obmenu-generator # License: GPLv3 # Created: 25 March 2011 -# Latest edit: 16 September 2017 +# Latest edit: 04 October 2017 # https://github.com/trizen/obmenu-generator use 5.014; + #use strict; #use warnings; @@ -115,8 +116,8 @@ my $config_help = <<"HELP"; | gtk_rc_filename : Absolute path to the GTK configuration file. | missing_icon : Use this icon for missing icons (default: gtk-missing-image) | icon_size : Preferred size for icons. (default: 32) - | force_svg_icons : Use only SVG icons. (default: 0) - | force_icon_size : Use only icons at the preferred icon size, if possible. (default: 0) + | generic_fallback : Try to shorten icon name at '-' characters before looking at inherited themes. (default: 0) + | force_icon_size : Always get the icon scaled to the requested size. (default: 0) || KEYS | name_keys : Valid keys for application name. @@ -246,9 +247,9 @@ my %CONFIG = ( missing_icon => 'gtk-missing-image', gtk_rc_filename => "$home_dir/.gtkrc-2.0", - icon_size => 32, - force_svg_icons => 0, - force_icon_size => 0, + icon_size => 32, + force_icon_size => 0, + generic_fallback => 0, VERSION => $version, ); @@ -438,8 +439,8 @@ sub get_icon_path { #<<< state $flags = "${gtk}::IconLookupFlags"->new( [ - ($CONFIG{force_icon_size} ? 'force-size' : ()), - ($CONFIG{force_svg_icons} ? 'force-svg' : ()), + ($CONFIG{force_icon_size} ? 'force-size' : ()), + ($CONFIG{generic_fallback} ? 'generic-fallback' : ()), ] ); #>>>