diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-09-01 11:33:43 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-09-01 11:33:43 +0000 |
| commit | 7b65ef7206fc88e0b3adaf5f0bb64c72ff89c8da (patch) | |
| tree | 226338552200265b1751cc10c55bd8d1a5b155f0 | |
| parent | 5d25729969df02d0516219060d71b8c191ffb047 (diff) | |
| download | fpc-7b65ef7206fc88e0b3adaf5f0bb64c72ff89c8da.tar.gz | |
--- Merging r36294 into '.':
U packages/gtk2/src/gtk+/gtk/gtkicontheme.inc
--- Recording mergeinfo for merge of r36294 into '.':
U .
# revisions: 36294
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@37099 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/gtk2/src/gtk+/gtk/gtkicontheme.inc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/packages/gtk2/src/gtk+/gtk/gtkicontheme.inc b/packages/gtk2/src/gtk+/gtk/gtkicontheme.inc index fb06242436..202112386e 100644 --- a/packages/gtk2/src/gtk+/gtk/gtkicontheme.inc +++ b/packages/gtk2/src/gtk+/gtk/gtkicontheme.inc @@ -32,6 +32,12 @@ type gtk_icon_theme_lookup_icon() includes builtin icons as well as files. For a builtin icon, gdk_icon_info_get_filename() returns %NULL and you need to call gdk_icon_info_get_builtin_pixbuf(). + @GTK_ICON_LOOKUP_GENERIC_FALLBACK + Try to shorten icon name at '-' characters before looking at inherited + themes. For more general fallback, seegtk_icon_theme_choose_icon(). + Since 2.12. + @GTK_ICON_LOOKUP_FORCE_SIZE + Always return the icon scaled to the requested size. Since 2.14. Used to specify options for gtk_icon_theme_lookup_icon() } @@ -39,7 +45,10 @@ type PGtkIconLookupFlags = ^TGtkIconLookupFlags; TGtkIconLookupFlags = (GTK_ICON_LOOKUP_NO_SVG := 1 shl 0, GTK_ICON_LOOKUP_FORCE_SVG := 1 shl 1, - GTK_ICON_LOOKUP_USE_BUILTIN := 1 shl 2); + GTK_ICON_LOOKUP_USE_BUILTIN := 1 shl 2, + GTK_ICON_LOOKUP_GENERIC_FALLBACK := 1 shl 3, + GTK_ICON_LOOKUP_FORCE_SIZE := 1 shl 4 + ); { GtkIconThemeError: |