Compare commits

...

8 Commits

Author SHA1 Message Date
Emmanuele Bassi d50301ee6a ci: Use the latest Fedora images 2020-10-17 15:40:52 +01:00
Emmanuele Bassi cb4d2d4153 ci: Rebase the Fedora images 2020-10-17 15:40:35 +01:00
Emmanuele Bassi 8854ecdb2b ci: Update base Fedora image to f32 2020-10-17 15:40:10 +01:00
Emmanuele Bassi e9eb385f25 Merge branch 'patch-1' into 'master'
Add some missing nullable return annotations

See merge request GNOME/gtk!2707
2020-10-17 14:08:29 +00:00
Sophie Herold cd0bef9390 Add some missing nullable return annotations 2020-10-17 15:32:36 +02:00
Matthias Clasen 5a79cc4d70 Merge branch 'wip/chergert/fix-macos-fps-calculation' into 'master'
macos: fix fps calculation for frame timings

See merge request GNOME/gtk!2705
2020-10-17 12:20:04 +00:00
Piotr Drąg 954855783a Update POTFILES.in 2020-10-17 11:11:24 +02:00
Christian Hergert 7ae8ed82c9 macos: fix fps calculation for frame timings
We need to mark the timings as complete after adding the
presentation time so that we have a valid FPS for the overlay
widget and/or fishbowl demo.
2020-10-15 21:04:51 -07:00
17 changed files with 29 additions and 20 deletions
+2 -2
View File
@@ -20,9 +20,9 @@ variables:
BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
MESON_TEST_TIMEOUT_MULTIPLIER: 3
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v25"
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v26"
FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25"
DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v26"
.only-default:
only:
+4 -2
View File
@@ -1,4 +1,4 @@
FROM fedora:31
FROM fedora:32
RUN dnf -y install \
adwaita-icon-theme \
@@ -47,6 +47,9 @@ RUN dnf -y install \
libcloudproviders-devel \
libepoxy-devel \
libffi-devel \
libglvnd-devel \
libglvnd-egl \
libglvnd-glx \
libmount-devel \
librsvg2 \
libselinux-devel \
@@ -65,7 +68,6 @@ RUN dnf -y install \
libxslt \
mesa-dri-drivers \
mesa-libEGL-devel \
mesa-libwayland-egl-devel \
ninja-build \
pango-devel \
pcre-devel \
+1 -1
View File
@@ -1,4 +1,4 @@
FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25
FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v26
RUN dnf -y install pandoc
+1 -1
View File
@@ -1,4 +1,4 @@
FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25
FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v26
# Enable sudo for wheel users
RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
+1 -1
View File
@@ -681,7 +681,7 @@ gdk_clipboard_read_async (GdkClipboard *clipboard,
*
* Finishes an asynchronous clipboard read started with gdk_clipboard_read_async().
*
* Returns: (transfer full): a #GInputStream or %NULL on error.
* Returns: (transfer full) (nullable): a #GInputStream or %NULL on error.
**/
GInputStream *
gdk_clipboard_read_finish (GdkClipboard *clipboard,
+1 -1
View File
@@ -385,7 +385,7 @@ gdk_content_formats_match_gtype (const GdkContentFormats *first,
* in @second. If no matching mime type is found, %NULL is
* returned.
*
* Returns: The first common mime type or %NULL if none.
* Returns: (nullable): The first common mime type or %NULL if none.
**/
const char *
gdk_content_formats_match_mime_type (const GdkContentFormats *first,
+1 -1
View File
@@ -1107,7 +1107,7 @@ gdk_display_notify_startup_complete (GdkDisplay *display,
* Gets the startup notification ID for a Wayland display, or %NULL
* if no ID has been defined.
*
* Returns: the startup notification ID for @display, or %NULL
* Returns: (nullable): the startup notification ID for @display, or %NULL
*/
const char *
gdk_display_get_startup_notification_id (GdkDisplay *display)
+4 -1
View File
@@ -713,7 +713,10 @@ _gdk_macos_surface_thaw (GdkMacosSurface *self,
timings = gdk_frame_clock_get_timings (frame_clock, self->pending_frame_counter);
if (timings != NULL)
timings->presentation_time = presentation_time - refresh_interval;
{
timings->presentation_time = presentation_time - refresh_interval;
timings->complete = TRUE;
}
self->pending_frame_counter = 0;
}
+1 -1
View File
@@ -873,7 +873,7 @@ gdk_wayland_display_get_next_serial (GdkDisplay *display)
* Gets the startup notification ID for a Wayland display, or %NULL
* if no ID has been defined.
*
* Returns: the startup notification ID for @display, or %NULL
* Returns: (nullable): the startup notification ID for @display, or %NULL
*/
const char *
gdk_wayland_display_get_startup_notification_id (GdkDisplay *display)
+1 -1
View File
@@ -1684,7 +1684,7 @@ gsk_transform_transform (GskTransform *next,
* between those cases, you should check @self is not %NULL
* before calling this function.
*
* Returns: The inverted transform or %NULL if the transform
* Returns: (nullable): The inverted transform or %NULL if the transform
* cannot be inverted.
**/
GskTransform *
+1 -1
View File
@@ -296,7 +296,7 @@ gtk_buildable_parse_context_pop (GtkBuildableParseContext *context)
* give the element_name as passed to those functions. For the parent
* elements, see gtk_buildable_parse_context_get_element_stack().
*
* Returns: the name of the currently open element, or %NULL
* Returns: (nullable): the name of the currently open element, or %NULL
*/
const char *
gtk_buildable_parse_context_get_element (GtkBuildableParseContext *context)
+1 -1
View File
@@ -1329,7 +1329,7 @@ gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion,
* Get the original text entered by the user that triggered
* the completion or %NULL if theres no completion ongoing.
*
* Returns: the prefix for the current completion
* Returns: (nullable): the prefix for the current completion
*/
const char *
gtk_entry_completion_get_completion_prefix (GtkEntryCompletion *completion)
+1 -1
View File
@@ -1026,7 +1026,7 @@ gtk_object_expression_new (GObject *object)
*
* Gets the object that the expression evaluates to.
*
* Returns: (transfer none): the object, or %NULL
* Returns: (transfer none) (nullable): the object, or %NULL
*/
GObject *
gtk_object_expression_get_object (GtkExpression *expression)
+1 -1
View File
@@ -128,7 +128,7 @@ _gtk_style_property_init (GtkStyleProperty *property)
* always be a #GtkCssValue whose values can be queried with
* _gtk_css_array_value_get_nth().
*
* Returns: %NULL on failure or the parsed #GtkCssValue
* Returns: (nullable): %NULL on failure or the parsed #GtkCssValue
**/
GtkCssValue *
_gtk_style_property_parse_value (GtkStyleProperty *property,
+4 -4
View File
@@ -623,7 +623,7 @@ gtk_tree_path_new (void)
* child of that 11th child, and the 1st child of that 5th child.
* If an invalid path string is passed in, %NULL is returned.
*
* Returns: A newly-created #GtkTreePath-struct, or %NULL
* Returns: (nullable): A newly-created #GtkTreePath-struct, or %NULL
*/
GtkTreePath *
gtk_tree_path_new_from_string (const char *path)
@@ -866,7 +866,7 @@ gtk_tree_path_get_depth (GtkTreePath *path)
*
* The length of the array can be obtained with gtk_tree_path_get_depth().
*
* Returns: The current indices, or %NULL
* Returns: (nullable): The current indices, or %NULL
*/
int *
gtk_tree_path_get_indices (GtkTreePath *path)
@@ -2286,7 +2286,7 @@ gtk_tree_row_reference_unref_path (GtkTreePath *path,
* propagated, and the path is updated appropriately. If
* @path isnt a valid path in @model, then %NULL is returned.
*
* Returns: a newly allocated #GtkTreeRowReference, or %NULL
* Returns: (nullable): a newly allocated #GtkTreeRowReference, or %NULL
*/
GtkTreeRowReference *
gtk_tree_row_reference_new (GtkTreeModel *model,
@@ -2333,7 +2333,7 @@ gtk_tree_row_reference_new (GtkTreeModel *model,
* need to carefully monitor exactly when a row reference updates
* itself, and is not generally needed by most applications.
*
* Returns: a newly allocated #GtkTreeRowReference, or %NULL
* Returns: (nullable): a newly allocated #GtkTreeRowReference, or %NULL
*/
GtkTreeRowReference *
gtk_tree_row_reference_new_proxy (GObject *proxy,
+2
View File
@@ -46,6 +46,8 @@ gdk/x11/gdkmain-x11.c
gdk/x11/gdkselectioninputstream-x11.c
gdk/x11/gdktextlistconverter-x11.c
gsk/gskrendernodeimpl.c
gtk/a11y/gtkatspiaction.c
gtk/a11y/gtkatspiroot.c
gtk/css/gtkcssdataurl.c
gtk/gtkaboutdialog.c
gtk/gtkaccelgroup.c
+2
View File
@@ -46,6 +46,8 @@ gdk/x11/gdkmain-x11.c
gdk/x11/gdkselectioninputstream-x11.c
gdk/x11/gdktextlistconverter-x11.c
gsk/gskrendernodeimpl.c
gtk/a11y/gtkatspiaction.c
gtk/a11y/gtkatspiroot.c
gtk/css/gtkcssdataurl.c
gtk/gtkaboutdialog.c
gtk/gtkaccelgroup.c