Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
wayland: Be more careful when loading cursors

See merge request GNOME/gtk!6622
This commit is contained in:
Matthias Clasen
2023-11-27 21:01:16 +00:00
parent 79cb370f81 96f7bb99a7
commit 606d150e0b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/wayland/gdkcursor-wayland.c
View File

@@ -175,7 +175,7 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
_gdk_wayland_display_get_cursor_theme (display),
desired_scale,
gdk_cursor_get_name (cursor));
if (c)
if (c && c->image_count > 0)
{
struct wl_cursor_image *image;
int cursor_scale;

2
gtk/gtkcssfiltervalue.c
View File

@@ -214,7 +214,7 @@ gtk_css_filter_get_matrix (const GtkCssFilter *filter,
break;
case GTK_CSS_FILTER_OPACITY:
value = _gtk_css_number_value_get (filter->invert.value, 1.0);
value = _gtk_css_number_value_get (filter->opacity.value, 1.0);
graphene_matrix_init_from_float (matrix, (float[16]) {
1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,