AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

See merge request GNOME/gtk!2647
This commit is contained in:
Matthias Clasen 2020-09-30 13:42:55 +00:00
commit 2dcf750198
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/reference/gtk/migrating-3to4.md
View File

@ -220,6 +220,18 @@ replace many uses of gtk_container_add() with equivalent container-specific
APIs such as gtk_box_pack_start() or gtk_grid_attach(), and thereby reduce
the amount of work you have to do at the time of the switch.
### Review your use of icon resources
When using icons as resources, the behavior of GTK 4 is different in one
respect: Icons that are directly in $APP_ID/icons/ are treated as unthemed
icons, which also means that symbolic icons are not recolored. If you want
your icon resources to have icon theme semantics, they need to be placed
into theme subdirectories such as $APP_ID/icons/16x16/actions or
$APP_ID/icons/scalable/status.
This location works fine in GTK 3 too, so you can prepare for this change
before switching to GTK 4.
## Changes that need to be done at the time of the switch
This section outlines porting tasks that you need to tackle when

7
gtk/gtkicontheme.c
View File

@ -1542,9 +1542,12 @@ gtk_icon_theme_add_search_path (GtkIconTheme *self,
*
* The resources are considered as part of the hicolor icon theme
* and must be located in subdirectories that are defined in the
* hicolor icon theme, such as `@path/16x16/actions/run.png`.
* hicolor icon theme, such as `@path/16x16/actions/run.png`
* or `@path/scalable/actions/run.svg`.
*
* Icons that are directly placed in the resource path instead
* of a subdirectory are also considered as ultimate fallback.
* of a subdirectory are also considered as ultimate fallback,
* but they are treated like unthemed icons.
*/
void
gtk_icon_theme_set_resource_path (GtkIconTheme *self,

6
make-release.sh
View File

@ -19,9 +19,9 @@ meson dist -C${release_build_dir} --include-subprojects || exit
meson configure -Dgtk_doc=true ${release_build_dir} || exit
ninja -C${release_build_dir} gdk4-doc gsk4-doc gtk4-doc || exit
tar -C ${release_build_dir} cf meson-dist/gdk-docs-${version}.tar.xz docs/reference/gdk
tar -C ${release_build_dir} cf meson-dist/gsk-docs-${version}.tar.xz docs/reference/gsk
tar -C ${release_build_dir} cf meson-dist/gtk-docs-${version}.tar.xz docs/reference/gtk
tar cf ${release_build_dir}/meson-dist/gdk-docs-${version}.tar.xz -C${release_build_dir} docs/reference/gdk
tar cf ${release_build_dir}/meson-dist/gsk-docs-${version}.tar.xz -C${release_build_dir} docs/reference/gsk
tar cf ${release_build_dir}/meson-dist/gtk-docs-${version}.tar.xz -C${release_build_dir} docs/reference/gtk
echo -e "\n\nGTK ${version} release on branch ${branch} in ./${release_build_dir}/:\n"