[gtk: 72/72] Merge branch 'wip/baedert/for-master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 72/72] Merge branch 'wip/baedert/for-master'
- Date: Wed, 14 Oct 2020 19:08:14 +0000 (UTC)
commit a772d8fcac03d99427d2f88dac5bf6c16a4cde5b
Merge: 974ce500d6 f93784f9e7
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Oct 14 15:07:09 2020 -0400
Merge branch 'wip/baedert/for-master'
Leaving out the gboolean -> bool change.
demos/gtk-demo/builder.c | 1 -
demos/gtk-demo/glarea.c | 1 +
demos/gtk-demo/shortcuts.ui | 2 +-
gdk/gdkgl.c | 19 +-
gsk/gl/gskglrenderer.c | 305 +++++++++++++++---------
gsk/gl/gskglrendererprivate.h | 6 +-
gsk/gl/gskglshaderbuilder.c | 6 +-
gsk/gskglshader.c | 4 +-
gsk/resources/glsl/blur.glsl | 3 -
gsk/resources/glsl/inset_shadow.glsl | 4 +-
gsk/resources/glsl/preamble.glsl | 2 +-
gsk/resources/glsl/unblurred_outset_shadow.glsl | 4 +-
gsk/vulkan/gskvulkanrenderpass.c | 1 -
gtk/gtkappchooserdialog.c | 1 -
gtk/gtkassistant.c | 1 -
gtk/gtkbuilder.c | 93 ++++----
gtk/gtkbuilderprivate.h | 3 -
gtk/gtkbutton.c | 1 -
gtk/gtkcolorchooserwidget.c | 1 -
gtk/gtkcolorplane.c | 79 ++----
gtk/gtkcolorscale.c | 34 ++-
gtk/gtkcolorutils.c | 140 +++++------
gtk/gtkcolumnviewcolumn.c | 1 -
gtk/gtkdialog.c | 1 -
gtk/gtkdragsource.c | 1 -
gtk/gtkdrawingarea.c | 1 -
gtk/gtkdropdown.c | 1 -
gtk/gtkemojichooser.c | 1 -
gtk/gtkentrycompletion.c | 1 -
gtk/gtkfilechooserdialog.c | 1 -
gtk/gtkfilechoosernative.c | 1 -
gtk/gtkfilechoosernativeportal.c | 1 -
gtk/gtkfilechoosernativequartz.c | 1 -
gtk/gtkfilechoosernativewin32.c | 1 -
gtk/gtkfilechooserwidget.c | 5 +-
gtk/gtkframe.c | 10 +-
gtk/gtkglarea.c | 1 -
gtk/gtkinfobar.c | 2 -
gtk/gtklinkbutton.c | 1 -
gtk/gtklistview.c | 1 -
gtk/gtklockbutton.c | 1 -
gtk/gtkmain.c | 7 +-
gtk/gtkmenubutton.c | 1 -
gtk/gtkmenusectionbox.c | 1 -
gtk/gtkmessagedialog.c | 1 -
gtk/gtkmodelbutton.c | 2 -
gtk/gtknativedialog.c | 1 -
gtk/gtkorientable.c | 1 -
gtk/gtkoverlay.c | 1 -
gtk/gtkoverlaylayout.c | 10 -
gtk/gtkpasswordentry.c | 1 -
gtk/gtkplacessidebar.c | 1 -
gtk/gtkpopovermenu.c | 1 -
gtk/gtkpopovermenubar.c | 1 -
gtk/gtksearchbar.c | 1 -
gtk/gtkshortcutssection.c | 1 -
gtk/gtkshortcutsshortcut.c | 1 -
gtk/gtkshortcutswindow.c | 1 -
gtk/gtksidebarrow.c | 1 -
gtk/gtkspinner.c | 1 -
gtk/gtkstacksidebar.c | 43 +---
gtk/gtkstackswitcher.c | 1 -
gtk/gtkstylecontext.c | 112 +--------
gtk/gtkstylecontext.h | 10 -
gtk/gtkstylecontextprivate.h | 2 -
gtk/gtktextviewchild.c | 1 -
gtk/gtktogglebutton.c | 1 -
gtk/gtktooltip.c | 1 -
gtk/gtkviewport.c | 1 -
gtk/gtkwidget.c | 6 +-
gtk/gtkwidgetprivate.h | 3 -
gtk/gtkwindow.c | 11 +-
gtk/gtkwindowcontrols.c | 40 ++--
gtk/inspector/actions.c | 1 -
gtk/inspector/controllers.c | 1 -
gtk/inspector/object-tree.c | 1 -
gtk/inspector/prop-list.c | 1 -
gtk/inspector/size-groups.c | 1 -
gtk/inspector/strv-editor.c | 1 -
gtk/tools/gdkpixbufutils.c | 2 +-
meson.build | 5 +-
tests/showrendernode.c | 3 +
tests/testfilechooser.c | 22 --
83 files changed, 408 insertions(+), 641 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]