diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2022-03-04 20:56:47 +0100 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2022-03-04 23:12:24 +0000 |
| commit | 79319a3a9105b30ab2767b7603adec84ee1c5c43 (patch) | |
| tree | 5f9f7d5013e6752eb0d9b73dac2938d797dd85f9 | |
| parent | ab21bedcfc04830eb416492cf6b34d5bca6c1ff4 (diff) | |
| download | mutter-79319a3a9105b30ab2767b7603adec84ee1c5c43.tar.gz | |
barrier/native: Fix warning about implicit enum conversion
Also add static asserts to make sure the values match so casting can be
done.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2319>
| -rw-r--r-- | src/backends/meta-barrier.c | 9 | ||||
| -rw-r--r-- | src/backends/native/meta-barrier-native.c | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/backends/meta-barrier.c b/src/backends/meta-barrier.c index d924d0ab3..94a4b7964 100644 --- a/src/backends/meta-barrier.c +++ b/src/backends/meta-barrier.c @@ -26,6 +26,15 @@ G_DEFINE_TYPE_WITH_PRIVATE (MetaBarrier, meta_barrier, G_TYPE_OBJECT) G_DEFINE_TYPE (MetaBarrierImpl, meta_barrier_impl, G_TYPE_OBJECT) +G_STATIC_ASSERT ((int) META_BARRIER_DIRECTION_POSITIVE_X == + (int) META_BORDER_MOTION_DIRECTION_POSITIVE_X); +G_STATIC_ASSERT ((int) META_BARRIER_DIRECTION_POSITIVE_Y == + (int) META_BORDER_MOTION_DIRECTION_POSITIVE_Y); +G_STATIC_ASSERT ((int) META_BARRIER_DIRECTION_NEGATIVE_X == + (int) META_BORDER_MOTION_DIRECTION_NEGATIVE_X); +G_STATIC_ASSERT ((int) META_BARRIER_DIRECTION_NEGATIVE_Y == + (int) META_BORDER_MOTION_DIRECTION_NEGATIVE_Y); + enum { PROP_0, diff --git a/src/backends/native/meta-barrier-native.c b/src/backends/native/meta-barrier-native.c index 3c9c1eabe..2e17c49c7 100644 --- a/src/backends/native/meta-barrier-native.c +++ b/src/backends/native/meta-barrier-native.c @@ -109,8 +109,11 @@ static gboolean is_barrier_blocking_directions (MetaBarrier *barrier, MetaBarrierDirection directions) { + MetaBorderMotionDirection border_motion_directions = + (MetaBorderMotionDirection) directions; + return meta_border_is_blocking_directions (&barrier->priv->border, - directions); + border_motion_directions); } static void |