diff options
| author | Cody Russell <cody@jhu.edu> | 2014-04-25 01:48:11 +0400 |
|---|---|---|
| committer | Cody Russell <cody@jhu.edu> | 2014-04-25 01:50:08 +0400 |
| commit | 6c9f1339090995b031780d60b42dd86687b4986e (patch) | |
| tree | 00d390eec85837e1357b23444dae1539cb622466 | |
| parent | fa37fa34b490b1eba4a8d89cb06fc3bd44d143a8 (diff) | |
When finding matching icon sources or cached icons, any scale greater than
1.0 should be treated as 2.0. This is imporant for Windows where scales can
be things like 1.25 or 1.5.
This doesn't do anything for us on Mac. I'm putting this into bockbuild
basically to have one less patch that diverges for us between Mac and Win32.
| -rw-r--r-- | packages/gtk+.py | 1 | ||||
| -rw-r--r-- | packages/patches/gtk/0076-iconfactory-treat-gt-1-0-icons-as-2-0.patch | 38 |
2 files changed, 39 insertions, 0 deletions
diff --git a/packages/gtk+.py b/packages/gtk+.py index db9d5b6..9760271 100644 --- a/packages/gtk+.py +++ b/packages/gtk+.py @@ -90,6 +90,7 @@ class GtkPackage (GnomeGitPackage): 'patches/gtk/0073-disable-combobox-scrolling.patch', 'patches/gtk/0074-fix-NULL-pointer-in-clipboard.patch', 'patches/gtk/0075-filechooserwidget-location-entry-activation.patch', + 'patches/gtk/0076-iconfactory-treat-gt-1-0-icons-as-2-0.patch', # Bug 702841 - GdkQuartz does not distinguish Eisu, Kana and Space keys on Japanese keyrboard # https://bugzilla.gnome.org/show_bug.cgi?id=702841 diff --git a/packages/patches/gtk/0076-iconfactory-treat-gt-1-0-icons-as-2-0.patch b/packages/patches/gtk/0076-iconfactory-treat-gt-1-0-icons-as-2-0.patch new file mode 100644 index 0000000..8c84743 --- /dev/null +++ b/packages/patches/gtk/0076-iconfactory-treat-gt-1-0-icons-as-2-0.patch @@ -0,0 +1,38 @@ +commit 072cd971ff3c9f48bd43b1e6f1e771dcb46f822a +Author: Cody Russell <cody@jhu.edu> +Date: Thu Apr 24 16:37:14 2014 -0500 + + When finding matching icon sources or cached icons, any scale greater than + 1.0 should be treated as 2.0. This is important on Windows where scales can + be things like 1.25 or 1.5. + +diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c +index 291c05e..5e356b7 100644 +--- a/gtk/gtkiconfactory.c ++++ b/gtk/gtkiconfactory.c +@@ -1323,11 +1323,12 @@ find_best_matching_source (GtkIconSet *icon_set, + GtkTextDirection direction, + GtkStateType state, + GtkIconSize size, +- gdouble scale, ++ gdouble _scale, + GSList *failed) + { + GtkIconSource *source; + GSList *tmp_list; ++ gdouble scale = (_scale > 1.0 ? 2.0 : 1.0); + + /* We need to find the best icon source. Direction matters more + * than state, state matters more than size. icon_set->sources +@@ -2586,10 +2587,11 @@ find_in_cache (GtkIconSet *icon_set, + GtkTextDirection direction, + GtkStateType state, + GtkIconSize size, +- gdouble scale) ++ gdouble _scale) + { + GSList *tmp_list; + GSList *prev; ++ gdouble scale = (_scale > 1.0 ? 2.0 : 1.0); + + ensure_cache_up_to_date (icon_set); |