[lightsoff/arnaudb/drop-clutter: 2/2] Drop Clutter dependency.




commit 1f61dd9de9858e77289ee04132e1eeceadf9e424
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Thu Oct 15 16:01:53 2020 +0200

    Drop Clutter dependency.

 meson.build                 |   2 -
 src/board-view-clutter.vala | 200 ---------------------------------
 src/game-view-clutter.vala  | 261 --------------------------------------------
 src/lightsoff-window.vala   |  22 +---
 src/meson.build             |   4 -
 5 files changed, 2 insertions(+), 487 deletions(-)
---
diff --git a/meson.build b/meson.build
index e74d8db..e2b2b3c 100644
--- a/meson.build
+++ b/meson.build
@@ -21,8 +21,6 @@ glib_dep = dependency('glib-2.0', version: '>= ' + glib_min_version)
 gmodule_dep = dependency('gmodule-2.0')
 gio_dep = dependency('gio-2.0', version: '>= ' + glib_min_version)
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.24')
-clutter_dep = dependency('clutter-1.0', version: '>= 1.14.0')
-clutter_gtk_dep = dependency('clutter-gtk-1.0', version: '>= 1.5.0')
 librsvg_dep = dependency('librsvg-2.0', version: '>= 2.32.0')
 
 # Check for compilers
diff --git a/src/lightsoff-window.vala b/src/lightsoff-window.vala
index c79591f..e8527e6 100644
--- a/src/lightsoff-window.vala
+++ b/src/lightsoff-window.vala
@@ -36,25 +36,7 @@ public class LightsoffWindow : ApplicationWindow
         key_controller.key_pressed.connect (on_key_pressed);
     }
 
-    public Gtk.Widget build_clutter_game_container (int level, out GameView out_game_view)
-    {
-        var clutter_embed = new GtkClutter.Embed ();
-        clutter_embed.show ();
-        var stage = (Clutter.Stage) clutter_embed.get_stage ();
-        stage.background_color = Clutter.Color.from_string ("#000000");
-
-        ClutterGameView clutter_game_view = new ClutterGameView (level);
-        clutter_game_view.show ();
-
-        stage.add_child (clutter_game_view);
-
-        out_game_view = clutter_game_view;
-        stage.set_size (clutter_game_view.width, clutter_game_view.height);
-        clutter_embed.set_size_request ((int) stage.width, (int) stage.height);
-        return clutter_embed;
-    }
-
-    public Gtk.Widget build_gtk_game_container (int level, out GameView out_game_view)
+    public Gtk.Widget build_game_container (int level, out GameView out_game_view)
     {
         var aspect_frame = new Gtk.AspectFrame (null, 0.5f, 0.5f, 1.0f, false);
         aspect_frame.set_shadow_type (ShadowType.NONE);
@@ -87,7 +69,7 @@ public class LightsoffWindow : ApplicationWindow
         int level = settings.get_int ("level");
         level_changed_cb (level);
 
-        this.add (build_gtk_game_container (level, out game_view));
+        this.add (build_game_container (level, out game_view));
 
         this.set_resizable (true);
         game_view.level_changed.connect (level_changed_cb);
diff --git a/src/meson.build b/src/meson.build
index 33ac90b..913fd7f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,12 +1,10 @@
 lightsoff_vala_sources = [
   'board-view.vala',
-  'board-view-clutter.vala',
   'board-view-gtk.vala',
   'lightsoff.vala',
   'lightsoff-window.vala',
   'puzzle-generator.vala',
   'game-view.vala',
-  'game-view-clutter.vala',
   'game-view-gtk.vala',
 ]
 
@@ -22,8 +20,6 @@ deps = [
   glib_dep,
   gio_dep,
   gtk_dep,
-  clutter_dep,
-  clutter_gtk_dep,
   librsvg_dep,
   libmath_dep,
   config_dep,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]