[mutter] backends: Make clutter stage resizing more explicit
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] backends: Make clutter stage resizing more explicit
- Date: Wed, 20 Jul 2016 06:27:33 +0000 (UTC)
commit 55726e787bd6b421542fbaf790e24556fc8c92df
Author: Jonas Ådahl <jadahl gmail com>
Date: Fri May 20 15:36:05 2016 +0800
backends: Make clutter stage resizing more explicit
The stage resizing was placed in the generic backend, which was only
run on certain configurations (when running nested or using the native
backend). This commits makes the resizing more explicit thus more
obvious.
https://bugzilla.gnome.org/show_bug.cgi?id=768976
src/backends/meta-backend.c | 10 ----------
src/backends/native/meta-backend-native.c | 10 ++++++++++
src/backends/x11/meta-backend-x11.c | 7 +++----
3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
index fbbb12c..e04f50f 100644
--- a/src/backends/meta-backend.c
+++ b/src/backends/meta-backend.c
@@ -347,15 +347,6 @@ meta_backend_real_ungrab_device (MetaBackend *backend,
}
static void
-meta_backend_real_update_screen_size (MetaBackend *backend,
- int width, int height)
-{
- MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
- clutter_actor_set_size (priv->stage, width, height);
-}
-
-static void
meta_backend_real_select_stage_events (MetaBackend *backend)
{
/* Do nothing */
@@ -393,7 +384,6 @@ meta_backend_class_init (MetaBackendClass *klass)
klass->create_cursor_renderer = meta_backend_real_create_cursor_renderer;
klass->grab_device = meta_backend_real_grab_device;
klass->ungrab_device = meta_backend_real_ungrab_device;
- klass->update_screen_size = meta_backend_real_update_screen_size;
klass->select_stage_events = meta_backend_real_select_stage_events;
klass->get_relative_motion_deltas = meta_backend_real_get_relative_motion_deltas;
diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
index 90223e1..9ab9c18 100644
--- a/src/backends/native/meta-backend-native.c
+++ b/src/backends/native/meta-backend-native.c
@@ -380,6 +380,15 @@ meta_backend_native_get_relative_motion_deltas (MetaBackend *backend,
}
static void
+meta_backend_native_update_screen_size (MetaBackend *backend,
+ int width, int height)
+{
+ ClutterActor *stage = meta_backend_get_stage (backend);
+
+ clutter_actor_set_size (stage, width, height);
+}
+
+static void
meta_backend_native_class_init (MetaBackendNativeClass *klass)
{
MetaBackendClass *backend_class = META_BACKEND_CLASS (klass);
@@ -401,6 +410,7 @@ meta_backend_native_class_init (MetaBackendNativeClass *klass)
backend_class->get_keymap = meta_backend_native_get_keymap;
backend_class->lock_layout_group = meta_backend_native_lock_layout_group;
backend_class->get_relative_motion_deltas = meta_backend_native_get_relative_motion_deltas;
+ backend_class->update_screen_size = meta_backend_native_update_screen_size;
}
static void
diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
index b427dc3..9c3bc62 100644
--- a/src/backends/x11/meta-backend-x11.c
+++ b/src/backends/x11/meta-backend-x11.c
@@ -813,10 +813,9 @@ meta_backend_x11_update_screen_size (MetaBackend *backend,
if (priv->mode == META_BACKEND_X11_MODE_NESTED)
{
- /* For a nested wayland session, we want to go through Clutter to update the
- * toplevel window size, rather than doing it directly.
- */
- META_BACKEND_CLASS (meta_backend_x11_parent_class)->update_screen_size (backend, width, height);
+ ClutterActor *stage = meta_backend_get_stage (backend);
+
+ clutter_actor_set_size (stage, width, height);
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]