brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtk: Make Rectangle no longer a typedef

Browse Source 
Now that we provide our own Region type which uses
MtkRectangle directly, there is no longer a need to go through cairo

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3292>
This commit is contained in:
Bilal Elmoussaoui 2023-09-04 18:19:55 +02:00 committed by Marge Bot
parent 655b4a9c75
commit 156fe0fdd8
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mtk/meson.build
View File

@ -28,7 +28,6 @@ supported_mtk_debug_c_args = cc.get_supported_arguments(mtk_debug_c_args)
mtk_c_args += mtk_debug_c_args mtk_c_args += mtk_debug_c_args
mtk_pkg_deps = [ mtk_pkg_deps = [
cairo_gobject_dep,
glib_dep, glib_dep,
gobject_dep, gobject_dep,
gio_dep, gio_dep,

13
mtk/mtk/mtk-rectangle.h
View File

@ -21,7 +21,6 @@
#pragma once #pragma once
#include <cairo.h>
#include <glib-object.h> #include <glib-object.h>
#include <graphene.h> #include <graphene.h>
@ -44,14 +43,6 @@ typedef enum _MtkRoundingStrategy
* @width: Width of the rectangle * @width: Width of the rectangle
* @height: Height of the rectangle * @height: Height of the rectangle
*/ */
#ifdef __GI_SCANNER__
/* The introspection scanner is currently unable to lookup how
* cairo_rectangle_int_t is actually defined. This prevents
* introspection data for the GdkRectangle type to include fields
* descriptions. To workaround this issue, we define it with the same
* content as cairo_rectangle_int_t, but only under the introspection
* define.
*/
struct _MtkRectangle struct _MtkRectangle
{ {
int x; int x;
@ -59,10 +50,8 @@ struct _MtkRectangle
int width; int width;
int height; int height;
}; };
typedef struct _MtkRectangle MtkRectangle; typedef struct _MtkRectangle MtkRectangle;
#else
typedef cairo_rectangle_int_t MtkRectangle;
#endif
#define MTK_RECTANGLE_INIT(_x, _y, _width, _height) \ #define MTK_RECTANGLE_INIT(_x, _y, _width, _height) \
(MtkRectangle) { \ (MtkRectangle) { \