Add GSVGtk support

Author: esodan

data/gtkcanvas.pc.in renamed to data/gcav.pc.in

@@ -5,8 +5,8 @@ deconf.set('API_VERSION', API_VERSION)
 deconf.set('prefix', get_option('prefix'))
 deconf.set('libdir', '${exec_prefix}/'+get_option('libdir'))
 
-configure_file(input : 'gtkcanvas.pc.in',
-	output : 'gtkcanvas-@[email protected]'.format(API_VERSION),
+configure_file(input : 'gcav.pc.in',
+	output : 'gcav-@[email protected]'.format(API_VERSION),
 	configuration : deconf,
 	install : true,
 	install_dir : join_paths(get_option('libdir'), 'pkgconfig')

data/meson.build

@@ -23,14 +23,17 @@ int main (string argv[]) {
     GtkClutter.init (ref argv);
 
     var window = new Gtk.Window ();
-    window.title = "GtkCanvas Demo";
+    window.title = "GtkCanvas (Gcav) Demo";
 
     window.resize (1000, 800);
 
-    var canvas = new GtkCanvas.Canvas (600, 400);
+    var canvas = new Gcav.Canvas (600, 400);
     canvas.add_shape ("rectangle", "blue", 45.0);
     canvas.add_shape ("rectangle", "red", 30.0);
     canvas.add_shape ("circle", "green", 0.0);
+#if GSVGTK
+    canvas.add_shape ("svg", "blue", 0.0);
+#endif
 
     canvas.clicked.connect ((modifier) => {
         canvas.resizer.visible = false;
@@ -94,4 +97,4 @@ int main (string argv[]) {
     window.show_all ();
     Gtk.main ();
     return 0;
-}
+}

demo/Window.vala

@@ -2,11 +2,15 @@ files_demo=([
         'Window.vala'
 ])
 
+args = ['--vapidir='+ldir]
+
+if svgdep.found()
+	args+= ['--define=GSVGTK']
+endif
+
 executable ('gtkcanvas-demo',
         files_demo,
-        vala_args: [
-                '--vapidir='+ldir
-        ],
+        vala_args: args,
 	dependencies : [ deps, inc_libh_dep ],
         link_with: lib,
         install: false)

demo/meson.build

@@ -1,3 +1,13 @@
+pkgs = [
+	'--pkg=gtk+-3.0',
+	'--pkg=granite',
+	'--pkg=clutter-1.0',
+	'--pkg=clutter-gtk-1.0'
+]
+if svgdep.found ()
+	pkgs += ['--pkg=gsvgtk-0.6']
+endif
+
 valadoc = find_program ('valadoc', required: false)
 if valadoc.found()
 	outdir = CAMEL_CASE_NAME+'-'+API_VERSION
@@ -17,10 +27,7 @@ if valadoc.found()
 				'--force',
 				pkgname,
 				pkgversion,
-				'--pkg=gtk+-3.0',
-				'--pkg=granite',
-				'--pkg=clutter-1.0',
-				'--pkg=clutter-gtk-1.0',
+				pkgs,
 				'--directory=@OUTDIR@',
 				valasources],
 			install : true,

docs/meson.build

@@ -1,10 +1,10 @@
 project('gtkcanvas', [ 'vala', 'c'], version : '0.1.0')
 
-PROJECT_NAME = meson.project_name()
+PROJECT_NAME = 'gcav'
 API_VERSION = '0.4'
 PROJECT_VERSION = meson.project_version()
 VERSIONED_PROJECT_NAME = PROJECT_NAME+'-'+API_VERSION
-CAMEL_CASE_NAME = 'GtkCanvas'
+CAMEL_CASE_NAME = 'Gcav'
 VERSIONED_CAMEL_CASE_NAME = CAMEL_CASE_NAME +'-'+ API_VERSION
 
 cc = meson.get_compiler('c')
@@ -17,6 +17,8 @@ deps = ([dependency('gtk+-3.0', version:'>=3.18'),
         m_dep
 ])
 
+svgdep = dependency('gsvgtk-0.6', version:'>=0.5.0', required: false)
+
 
 inc_rooth = include_directories ('.')
 inc_rooth_dep = declare_dependency (include_directories : inc_rooth)

meson.build

@@ -12,6 +12,13 @@ It is meant to contain the basic elements such as a basic container class, move,
 - clutter-gtk-1.0
 - granite
 
+#### For SVG support
+
+- gsvgtk-0.6
+- librsvg-2.0
+- gsvg-0.4
+- gxml-0.16
+
 ### To compile & run the demo
 
 #### Meson Build

readme.md

@@ -19,7 +19,7 @@
 * Authored by: Alessandro Castellani <[email protected]>
 */
 
-internal class GtkCanvas.HoverAction : Object  {
+internal class Gcav.HoverAction : Object  {
     /**
      * Toggle the visibility of the HoverEffect()
      */
@@ -42,9 +42,9 @@ internal class GtkCanvas.HoverAction : Object  {
     bool visible = false;
 
     /**
-     * Parent CanvasItem passed on mouse enter
+     * Parent Item passed on mouse enter
      */
-    private unowned CanvasItem item;
+    private unowned Item item;
 
     /**
      * HoverEffect (int border_width ) 
@@ -53,9 +53,9 @@ internal class GtkCanvas.HoverAction : Object  {
 
     /**
      * Initialize Class
-     * @param CanvasItem item [hovered item from canvas]
+     * @param Item item [hovered item from canvas]
      */
-    public HoverAction (CanvasItem item) {
+    public HoverAction (Item item) {
         this.item = item;
     }
 
@@ -67,4 +67,4 @@ internal class GtkCanvas.HoverAction : Object  {
     public void toggle (bool toggle) {
         toggled = toggle;
     }
-}
+}

src/Utils/HoverAction.vala

@@ -19,7 +19,7 @@
 * Authored by: Felipe Escoto <[email protected]>
 */
 
-internal class HoverEffect : Clutter.Effect {
+internal class Gcav.HoverEffect : Clutter.Effect {
     public int border_size { get; construct; }
     public float scale_factor { get; set; default = 1; }
 

src/Utils/HoverEffect.vala

@@ -20,15 +20,15 @@
 */
 
 /**
- * Manages and controls a CanvasItem's movement.
+ * Manages and controls a Item's movement.
  */
-internal class GtkCanvas.MoveAction : Clutter.DragAction {
+internal class Gcav.MoveAction : Clutter.DragAction {
     private int x_offset_press = 0;
     private int y_offset_press = 0;
 
-    private unowned CanvasItem item;
+    private unowned Item item;
 
-    public MoveAction (CanvasItem item) {
+    public MoveAction (Item item) {
         this.item = item;
 
         drag_begin.connect (on_move_begin);