AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
gdkevents.c: Fix up folding

See merge request GNOME/gtk!5496
This commit is contained in:
Matthias Clasen 2023-02-11 14:18:42 +00:00
commit 52e18eb7fb
2 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gdk/gdkevents.c
View File

@ -1511,7 +1511,6 @@ gdk_button_event_get_button (GdkEvent *event)
} }
/* }}} */ /* }}} */
/* {{{ GdkKeyEvent */ /* {{{ GdkKeyEvent */
/** /**
@ -1972,7 +1971,6 @@ gdk_key_event_get_match (GdkEvent *event,
} }
/* }}} */ /* }}} */
/* {{{ GdkTouchEvent */ /* {{{ GdkTouchEvent */
/** /**
@ -2109,7 +2107,6 @@ gdk_touch_event_get_emulating_pointer (GdkEvent *event)
} }
/* }}} */ /* }}} */
/* {{{ GdkCrossingEvent */ /* {{{ GdkCrossingEvent */
/** /**
@ -2253,7 +2250,6 @@ gdk_crossing_event_get_detail (GdkEvent *event)
} }
/* }}} */ /* }}} */
/* {{{ GdkDeleteEvent */ /* {{{ GdkDeleteEvent */
/** /**
@ -2284,7 +2280,6 @@ gdk_delete_event_new (GdkSurface *surface)
} }
/* }}} */ /* }}} */
/* {{{ GdkFocusEvent */ /* {{{ GdkFocusEvent */
/** /**
@ -2341,7 +2336,6 @@ gdk_focus_event_get_in (GdkEvent *event)
} }
/* }}} */ /* }}} */
/* {{{ GdkScrollEvent */ /* {{{ GdkScrollEvent */
/** /**
@ -2600,7 +2594,6 @@ gdk_scroll_event_get_unit (GdkEvent *event)
} }
/* }}} */ /* }}} */
/* {{{ GdkTouchpadEvent */ /* {{{ GdkTouchpadEvent */
/** /**
@ -2859,7 +2852,6 @@ gdk_touchpad_event_get_pinch_scale (GdkEvent *event)
} }
/* }}} */ /* }}} */
/* {{{ GdkPadEvent */ /* {{{ GdkPadEvent */
/** /**
@ -3033,7 +3025,6 @@ gdk_pad_event_get_group_mode (GdkEvent *event,
} }
/* }}} */ /* }}} */
/* {{{ GdkMotionEvent */ /* {{{ GdkMotionEvent */
/** /**
@ -3195,7 +3186,6 @@ gdk_event_get_history (GdkEvent *event,
} }
/* }}} */ /* }}} */
/* {{{ GdkProximityEvent */ /* {{{ GdkProximityEvent */
/** /**
@ -3258,7 +3248,6 @@ gdk_proximity_event_new (GdkEventType type,
} }
/* }}} */ /* }}} */
/* {{{ GdkDNDEvent */ /* {{{ GdkDNDEvent */
/** /**
@ -3364,7 +3353,6 @@ gdk_dnd_event_get_drop (GdkEvent *event)
} }
/* }}} */ /* }}} */
/* {{{ GdkGrabBrokenEvent */ /* {{{ GdkGrabBrokenEvent */
/** /**
@ -3442,3 +3430,5 @@ gdk_grab_broken_event_get_implicit (GdkEvent *event)
} }
/* }}} */ /* }}} */
/* vim:set foldmethod=marker expandtab: */

72
gsk/gskrendernodeimpl.c
View File

@ -58,7 +58,7 @@ rectangle_init_from_graphene (cairo_rectangle_int_t *cairo,
cairo->height = ceilf (graphene->origin.y + graphene->size.height) - cairo->y; cairo->height = ceilf (graphene->origin.y + graphene->size.height) - cairo->y;
} }
/*** GSK_COLOR_NODE ***/ /* {{{ GSK_COLOR_NODE */
/** /**
* GskColorNode: * GskColorNode:
@ -147,7 +147,8 @@ gsk_color_node_new (const GdkRGBA *rgba,
return node; return node;
} }
/*** GSK_LINEAR_GRADIENT_NODE ***/ /* }}} */
/* {{{ GSK_LINEAR_GRADIENT_NODE */
/** /**
* GskRepeatingLinearGradientNode: * GskRepeatingLinearGradientNode:
@ -420,7 +421,8 @@ gsk_linear_gradient_node_get_color_stops (const GskRenderNode *node,
return self->stops; return self->stops;
} }
/*** GSK_RADIAL_GRADIENT_NODE ***/ /* }}} */
/* {{{ GSK_RADIAL_GRADIENT_NODE */
/** /**
* GskRepeatingRadialGradientNode: * GskRepeatingRadialGradientNode:
@ -790,7 +792,8 @@ gsk_radial_gradient_node_get_end (const GskRenderNode *node)
return self->end; return self->end;
} }
/*** GSK_CONIC_GRADIENT_NODE ***/ /* }}} */
/* {{{ GSK_CONIC_GRADIENT_NODE */
/** /**
* GskConicGradientNode: * GskConicGradientNode:
@ -1147,7 +1150,8 @@ gsk_conic_gradient_node_get_angle (const GskRenderNode *node)
return self->angle; return self->angle;
} }
/*** GSK_BORDER_NODE ***/ /* }}} */
/* {{{ GSK_BORDER_NODE */
/** /**
* GskBorderNode: * GskBorderNode:
@ -1459,7 +1463,8 @@ gsk_border_node_get_uniform_color (const GskRenderNode *self)
return node->uniform_color; return node->uniform_color;
} }
/*** GSK_TEXTURE_NODE ***/ /* }}} */
/* {{{ GSK_TEXTURE_NODE */
/** /**
* GskTextureNode: * GskTextureNode:
@ -1576,7 +1581,8 @@ gsk_texture_node_new (GdkTexture *texture,
return node; return node;
} }
/*** GSK_INSET_SHADOW_NODE ***/ /* }}} */
/* {{{ GSK_INSET_SHADOW_NODE */
/** /**
* GskInsetShadowNode: * GskInsetShadowNode:
@ -2132,7 +2138,8 @@ gsk_inset_shadow_node_get_blur_radius (const GskRenderNode *node)
return self->blur_radius; return self->blur_radius;
} }
/*** GSK_OUTSET_SHADOW_NODE ***/ /* }}} */
/* {{{ GSK_OUTSET_SHADOW_NODE */
/** /**
* GskOutsetShadowNode: * GskOutsetShadowNode:
@ -2438,7 +2445,8 @@ gsk_outset_shadow_node_get_blur_radius (const GskRenderNode *node)
return self->blur_radius; return self->blur_radius;
} }
/*** GSK_CAIRO_NODE ***/ /* }}} */
/* {{{ GSK_CAIRO_NODE */
/** /**
* GskCairoNode: * GskCairoNode:
@ -2576,7 +2584,8 @@ gsk_cairo_node_get_draw_context (GskRenderNode *node)
return res; return res;
} }
/**** GSK_CONTAINER_NODE ***/ /* }}} */
/* {{{ GSK_CONTAINER_NODE */
/** /**
* GskContainerNode: * GskContainerNode:
@ -2835,7 +2844,8 @@ gsk_container_node_is_disjoint (const GskRenderNode *node)
return self->disjoint; return self->disjoint;
} }
/*** GSK_TRANSFORM_NODE ***/ /* }}} */
/* {{{ GSK_TRANSFORM_NODE */
/** /**
* GskTransformNode: * GskTransformNode:
@ -3058,7 +3068,8 @@ gsk_transform_node_get_translate (const GskRenderNode *node,
*dy = self->dy; *dy = self->dy;
} }
/*** GSK_OPACITY_NODE ***/ /* }}} */
/* {{{ GSK_OPACITY_NODE */
/** /**
* GskOpacityNode: * GskOpacityNode:
@ -3185,7 +3196,8 @@ gsk_opacity_node_get_opacity (const GskRenderNode *node)
return self->opacity; return self->opacity;
} }
/*** GSK_COLOR_MATRIX_NODE ***/ /* }}} */
/* {{{ GSK_COLOR_MATRIX_NODE */
/** /**
* GskColorMatrixNode: * GskColorMatrixNode:
@ -3406,7 +3418,8 @@ gsk_color_matrix_node_get_color_offset (const GskRenderNode *node)
return &self->color_offset; return &self->color_offset;
} }
/*** GSK_REPEAT_NODE ***/ /* }}} */
/* {{{ GSK_REPEAT_NODE */
/** /**
* GskRepeatNode: * GskRepeatNode:
@ -3542,7 +3555,8 @@ gsk_repeat_node_get_child_bounds (const GskRenderNode *node)
return &self->child_bounds; return &self->child_bounds;
} }
/*** GSK_CLIP_NODE ***/ /* }}} */
/* {{{ GSK_CLIP_NODE */
/** /**
* GskClipNode: * GskClipNode:
@ -3676,7 +3690,8 @@ gsk_clip_node_get_clip (const GskRenderNode *node)
return &self->clip; return &self->clip;
} }
/*** GSK_ROUNDED_CLIP_NODE ***/ /* }}} */
/* {{{ GSK_ROUNDED_CLIP_NODE */
/** /**
* GskRoundedClipNode: * GskRoundedClipNode:
@ -3810,7 +3825,8 @@ gsk_rounded_clip_node_get_clip (const GskRenderNode *node)
return &self->clip; return &self->clip;
} }
/*** GSK_SHADOW_NODE ***/ /* }}} */
/* {{{ GSK_SHADOW_NODE */
/** /**
* GskShadowNode: * GskShadowNode:
@ -4050,7 +4066,8 @@ gsk_shadow_node_get_n_shadows (const GskRenderNode *node)
return self->n_shadows; return self->n_shadows;
} }
/*** GSK_BLEND_NODE ***/ /* }}} */
/* {{{ GSK_BLEND_NODE */
/** /**
* GskBlendNode: * GskBlendNode:
@ -4244,7 +4261,8 @@ gsk_blend_node_get_blend_mode (const GskRenderNode *node)
return self->blend_mode; return self->blend_mode;
} }
/*** GSK_CROSS_FADE_NODE ***/ /* }}} */
/* {{{ GSK_CROSS_FADE_NODE */
/** /**
* GskCrossFadeNode: * GskCrossFadeNode:
@ -4395,7 +4413,8 @@ gsk_cross_fade_node_get_progress (const GskRenderNode *node)
return self->progress; return self->progress;
} }
/*** GSK_TEXT_NODE ***/ /* }}} */
/* {{{ GSK_TEXT_NODE */
/** /**
* GskTextNode: * GskTextNode:
@ -4660,7 +4679,8 @@ gsk_text_node_get_offset (const GskRenderNode *node)
return &self->offset; return &self->offset;
} }
/*** GSK_BLUR_NODE ***/ /* }}} */
/* {{{ GSK_BLUR_NODE */
/** /**
* GskBlurNode: * GskBlurNode:
@ -4979,7 +4999,8 @@ gsk_blur_node_get_radius (const GskRenderNode *node)
return self->radius; return self->radius;
} }
/*** GSK_DEBUG_NODE ***/ /* }}} */
/* {{{ GSK_DEBUG_NODE */
/** /**
* GskDebugNode: * GskDebugNode:
@ -5104,7 +5125,8 @@ gsk_debug_node_get_message (const GskRenderNode *node)
return self->message; return self->message;
} }
/*** GSK_GL_SHADER_NODE ***/ /* }}} */
/* {{{ GSK_GL_SHADER_NODE */
/** /**
* GskGLShaderNode: * GskGLShaderNode:
@ -5309,6 +5331,8 @@ gsk_gl_shader_node_get_args (const GskRenderNode *node)
return self->args; return self->args;
} }
/* }}} */
GType gsk_render_node_types[GSK_RENDER_NODE_TYPE_N_TYPES]; GType gsk_render_node_types[GSK_RENDER_NODE_TYPE_N_TYPES];
#ifndef I_ #ifndef I_
@ -5884,3 +5908,5 @@ gsk_render_node_init_types (void)
g_once_init_leave (&register_types__volatile, initialized); g_once_init_leave (&register_types__volatile, initialized);
} }
} }
/* vim:set foldmethod=marker expandtab: */