[gtk: 4/5] Merge branch 'main' into 'm-shinder-master-patch-90567'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 4/5] Merge branch 'main' into 'm-shinder-master-patch-90567'
- Date: Mon, 27 Dec 2021 15:08:49 +0000 (UTC)
commit 6fd4421adde07c3eb804cfdf6069720e377fd8b9
Merge: 40eca1a68e ef51e02767
Author: m-shinder <mihail shinder ml>
Date: Sun Dec 26 21:20:33 2021 +0000
Merge branch 'main' into 'm-shinder-master-patch-90567'
# Conflicts:
# NEWS
.gitlab-ci.yml | 34 +-
.gitlab-ci/flatpak-build.sh | 2 +-
.gitlab-ci/meson-html-report.py | 2 +-
.gitlab-ci/meson-junit-report.py | 2 +-
.gitlab-ci/run-style-check-diff.sh | 6 +-
.gitlab-ci/test-msvc.bat | 2 +-
.gitlab-ci/test-msys2.sh | 5 +-
.gitlab/issue_templates/Bug.md | 2 +-
.gitlab/issue_templates/Crash.md | 2 +-
CONTRIBUTING.md | 2 +-
NEWS | 87 +-
README.md | 18 +-
build-aux/flatpak/org.gtk.Demo4.json | 3 +-
build-aux/flatpak/org.gtk.IconBrowser4.json | 3 +-
build-aux/flatpak/org.gtk.WidgetFactory4.json | 3 +-
demos/constraint-editor/meson.build | 2 +-
demos/gtk-demo/clipboard.c | 449 +-
demos/gtk-demo/clipboard.ui | 288 +
demos/gtk-demo/demo.gresource.xml | 1 +
demos/gtk-demo/hypertext.c | 10 +-
demos/gtk-demo/meson.build | 4 +-
demos/gtk-demo/tabs.c | 16 +-
demos/icon-browser/meson.build | 2 +-
demos/meson.build | 2 +-
demos/node-editor/meson.build | 2 +-
demos/node-editor/node-editor-window.c | 41 +-
demos/print-editor/meson.build | 2 +-
demos/widget-factory/meson.build | 2 +-
demos/widget-factory/widget-factory.c | 22 +-
demos/widget-factory/widget-factory.ui | 10 +
docs/reference/gtk/migrating-3to4.md | 13 +-
gdk/gdkcontentdeserializer.c | 21 +-
gdk/gdkcontentformats.c | 40 +-
gdk/gdkcontentserializer.c | 31 +-
gdk/gdkdevice.c | 4 +
gdk/gdkdevice.h | 2 +-
gdk/gdkevents.c | 199 +-
gdk/gdkeventsprivate.h | 25 +-
gdk/gdkglcontext.c | 80 +-
gdk/gdkglcontextprivate.h | 8 +-
gdk/gdkgltexture.c | 7 +-
gdk/gdkmarshalers.list | 1 +
gdk/gdksurface.c | 7 +-
gdk/gdktexture.c | 45 +-
gdk/gdktexture.h | 4 -
gdk/loaders/gdktiff.c | 9 +-
gdk/macos/gdkmacosdisplay-translate.c | 1 +
gdk/wayland/gdkdevice-wayland.c | 24 +-
gdk/wayland/gdkdisplay-wayland.c | 39 +
gdk/win32/gdksurface-win32.c | 214 +-
gdk/win32/gdksurface-win32.h | 1 +
gdk/x11/gdkclipboard-x11.c | 28 +-
gdk/x11/gdkdevicemanager-xi2.c | 8 +-
gdk/x11/gdkdrag-x11.c | 28 +-
gdk/x11/gdkglcontext-glx.c | 2 +
gdk/x11/gdkselectionoutputstream-x11.c | 79 +-
gsk/gl/gskglcommandqueue.c | 6 +-
gsk/gl/gskglcompiler.c | 29 +-
gsk/gl/gskglrenderjob.c | 98 +-
gsk/gl/resources/conic_gradient.glsl | 4 +-
gsk/gl/resources/linear_gradient.glsl | 4 +-
gsk/gl/resources/preamble.glsl | 2 -
gsk/gl/resources/radial_gradient.glsl | 4 +-
gsk/gskdiff.c | 19 +-
gsk/gskdiffprivate.h | 6 +-
gsk/gskrendernodeimpl.c | 55 +-
gtk/a11y/gtkatspicontext.c | 3 +
gtk/gtkactionmuxer.c | 27 +-
gtk/gtkapplication.c | 6 +-
gtk/gtkbitset.c | 26 +-
gtk/gtkbitset.h | 5 +-
gtk/gtkbuilderprecompile.c | 438 +-
gtk/gtkcolorbutton.c | 1 +
gtk/gtkcolorswatch.c | 55 +-
gtk/gtkcolorswatchprivate.h | 2 +
gtk/gtkdragicon.c | 26 +-
gtk/gtkdroptarget.c | 17 +-
gtk/gtkenums.h | 25 +
gtk/gtkexpression.c | 2 +-
gtk/gtkgesturestylus.c | 18 +-
gtk/gtkimcontextquartz.c | 7 +-
gtk/gtkimcontextwayland.c | 2 +-
gtk/gtklabel.c | 167 +-
gtk/gtklabel.h | 5 +
gtk/gtklistbox.h | 3 +
gtk/gtkmain.c | 2 +
gtk/gtkmenutrackeritem.c | 31 +-
gtk/gtkpicture.c | 3 +-
gtk/gtkpopover.c | 6 +
gtk/gtkprintoperation-unix.c | 186 +-
gtk/gtkprogressbar.c | 1 +
gtk/gtksearchbar.c | 2 +-
gtk/gtkshortcutswindow.c | 6 +-
gtk/gtksizerequest.c | 6 +-
gtk/gtktext.c | 96 +-
gtk/gtktextbtree.c | 157 +-
gtk/gtktextbuffer.c | 185 +-
gtk/gtktextchild.c | 118 +-
gtk/gtktextchild.h | 13 +-
gtk/gtktextchildprivate.h | 2 +
gtk/gtktextiter.c | 204 +-
gtk/gtktextlayout.c | 216 +-
gtk/gtktextview.c | 36 +-
gtk/gtktypes.h | 2 +-
gtk/gtkviewport.c | 156 +-
gtk/gtkwindow.c | 14 +-
gtk/gtkwindowprivate.h | 5 +
.../scalable/actions/function-linear-symbolic.svg | 2 +
gtk/inspector/clipboard.c | 315 +
gtk/inspector/clipboard.h | 38 +
gtk/inspector/clipboard.ui | 98 +
gtk/inspector/eventrecording.c | 69 +
gtk/inspector/eventrecording.h | 64 +
gtk/inspector/general.c | 40 +
gtk/inspector/general.ui | 26 +
gtk/inspector/gtkdataviewer.c | 412 +
gtk/inspector/gtkdataviewer.h | 47 +
gtk/inspector/init.c | 4 +
gtk/inspector/inspector.css | 4 +
gtk/inspector/measuregraph.c | 250 +
gtk/inspector/measuregraph.h | 40 +
gtk/inspector/meson.build | 5 +
gtk/inspector/misc-info.c | 62 +
gtk/inspector/misc-info.ui | 59 +
gtk/inspector/prop-editor.c | 23 +-
gtk/inspector/recorder.c | 777 +-
gtk/inspector/recorder.h | 10 +
gtk/inspector/recorder.ui | 193 +-
gtk/inspector/recorderrow.c | 138 +
gtk/inspector/recorderrow.h | 24 +
gtk/inspector/window.c | 11 +-
gtk/inspector/window.h | 1 +
gtk/inspector/window.ui | 18 +
gtk/meson.build | 21 +-
gtk/theme/Default/_colors.scss | 1 +
gtk/theme/Default/_common.scss | 66 +-
meson.build | 20 +-
modules/media/gtkgstmediafile.c | 4 +-
po-properties/POTFILES.in | 1 +
po-properties/POTFILES.skip | 2 +
po-properties/is.po | 9468 +++++++++-----------
po-properties/lt.po | 427 +-
po-properties/pt.po | 502 +-
po-properties/uk.po | 516 +-
po/POTFILES.in | 2 +
po/POTFILES.skip | 1 +
po/gl.po | 378 +-
po/is.po | 1581 ++--
po/lt.po | 323 +-
po/pt.po | 408 +-
po/sv.po | 461 +-
po/uk.po | 382 +-
tests/meson.build | 1 +
tests/testtextscroll.c | 193 +
testsuite/gdk/memorytexture.c | 139 -
testsuite/gdk/texture-threads.c | 6 -
testsuite/gsk/compare/linear-gradient-3d.node | 13 +
testsuite/gsk/compare/linear-gradient-3d.png | Bin 0 -> 151 bytes
testsuite/gsk/meson.build | 8 +-
testsuite/gtk/imcontext.c | 16 +-
testsuite/gtk/textbuffer.c | 71 +
testsuite/introspection/meson.build | 19 +-
...r-center-100x100-picture-in-100x200-overlay.css | 15 +
...enter-100x100-picture-in-100x200-overlay.ref.ui | 9 +
...er-center-100x100-picture-in-100x200-overlay.ui | 24 +
.../center-center-100x100-picture-in-100x200.ui | 23 +-
...r-center-100x100-picture-in-200x100-overlay.css | 15 +
...enter-100x100-picture-in-200x100-overlay.ref.ui | 9 +
...er-center-100x100-picture-in-200x100-overlay.ui | 24 +
.../center-center-100x100-picture-in-200x100.ui | 23 +-
...r-center-150x150-picture-in-100x200-overlay.css | 15 +
...enter-150x150-picture-in-100x200-overlay.ref.ui | 9 +
...er-center-150x150-picture-in-100x200-overlay.ui | 24 +
.../center-center-150x150-picture-in-100x200.css | 2 +-
.../center-center-150x150-picture-in-100x200.ui | 23 +-
...r-center-150x150-picture-in-200x100-overlay.css | 15 +
...enter-150x150-picture-in-200x100-overlay.ref.ui | 9 +
...er-center-150x150-picture-in-200x100-overlay.ui | 24 +
.../center-center-150x150-picture-in-200x100.ui | 23 +-
...r-center-200x200-picture-in-100x200-overlay.css | 15 +
...enter-200x200-picture-in-100x200-overlay.ref.ui | 9 +
...er-center-200x200-picture-in-100x200-overlay.ui | 24 +
.../center-center-200x200-picture-in-100x200.css | 2 +-
.../center-center-200x200-picture-in-100x200.ui | 23 +-
...r-center-200x200-picture-in-200x100-overlay.css | 15 +
...enter-200x200-picture-in-200x100-overlay.ref.ui | 9 +
...er-center-200x200-picture-in-200x100-overlay.ui | 24 +
.../center-center-200x200-picture-in-200x100.ui | 23 +-
...ter-center-20x20-picture-in-100x200-overlay.css | 15 +
...-center-20x20-picture-in-100x200-overlay.ref.ui | 9 +
...nter-center-20x20-picture-in-100x200-overlay.ui | 24 +
.../center-center-20x20-picture-in-100x200.ui | 23 +-
...ter-center-20x20-picture-in-200x100-overlay.css | 15 +
...-center-20x20-picture-in-200x100-overlay.ref.ui | 9 +
...nter-center-20x20-picture-in-200x100-overlay.ui | 24 +
.../center-center-20x20-picture-in-200x100.ui | 23 +-
...r-center-300x300-picture-in-100x200-overlay.css | 15 +
...enter-300x300-picture-in-100x200-overlay.ref.ui | 9 +
...er-center-300x300-picture-in-100x200-overlay.ui | 24 +
.../center-center-300x300-picture-in-100x200.css | 2 +-
.../center-center-300x300-picture-in-100x200.ui | 23 +-
...r-center-300x300-picture-in-200x100-overlay.css | 15 +
...enter-300x300-picture-in-200x100-overlay.ref.ui | 9 +
...er-center-300x300-picture-in-200x100-overlay.ui | 24 +
.../center-center-300x300-picture-in-200x100.ui | 23 +-
.../reftests/hbox-with-ellipsizing-label.ref.ui | 15 +
testsuite/reftests/hbox-with-ellipsizing-label.ui | 16 +
.../hbox-with-ellipsizing-wrapping-label.ref.ui | 17 +
.../hbox-with-ellipsizing-wrapping-label.ui | 18 +
testsuite/reftests/label-sizing.ref.ui | 1 -
testsuite/reftests/label-sizing.ui | 1 -
.../label-wrap-word-char-natural-size.ref.ui | 30 +
.../reftests/label-wrap-word-char-natural-size.ui | 35 +
testsuite/reftests/meson.build | 36 +
testsuite/testutils.c | 2 +-
testsuite/testutils.h | 2 +-
testsuite/tools/settings.in | 9 +-
tools/gtk-builder-tool-simplify.c | 19 +-
218 files changed, 13612 insertions(+), 9520 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
