[ease/presenter] Presenter window is a GtkWindow



commit af9aec6047b9e7059fa67719f3432f286da75f1c
Author: Stéphane Maniaci <stephane maniaci gmail com>
Date:   Sun Aug 15 23:42:30 2010 -0500

    Presenter window is a GtkWindow

 ease/ease-player.vala           |    5 +++--
 ease/ease-presenter-window.vala |   14 ++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/ease/ease-player.vala b/ease/ease-player.vala
index 2feced8..a441e54 100644
--- a/ease/ease-player.vala
+++ b/ease/ease-player.vala
@@ -28,7 +28,7 @@ internal class Ease.Player : Gtk.Window
 	internal Clutter.Stage stage { get; set; }
 	private bool can_animate { get; set; }
 	private bool dragging = false;
-
+	private PresenterWindow presenter_window;
 	// current and transitioning out slide
 	private SlideActor current_slide;
 	private SlideActor old_slide;
@@ -153,7 +153,7 @@ internal class Ease.Player : Gtk.Window
 		show_all();
 		present();
 		
-		var presenter = new PresenterWindow (this.document);
+		presenter_window = new PresenterWindow (this.document);
 		can_animate = true;
 		advance();
 	}
@@ -212,6 +212,7 @@ internal class Ease.Player : Gtk.Window
 		case Key.ESCAPE:
 			debug ("Quitting player.");
 			stage.hide ();
+			presenter_window.hide ();
 			break;
 		case Key.RIGHT:
 		case Key.DOWN:
diff --git a/ease/ease-presenter-window.vala b/ease/ease-presenter-window.vala
index d3abdb5..6677057 100644
--- a/ease/ease-presenter-window.vala
+++ b/ease/ease-presenter-window.vala
@@ -8,7 +8,7 @@
  * (typed into the { link EditorWindow}), number of slides left and time 
  * elapsed.
  */
-internal class Ease.PresenterWindow
+internal class Ease.PresenterWindow : Gtk.Window
 {
 	internal Document document { get; set; }
 	internal int slide_index { get; set; }
@@ -30,12 +30,14 @@ internal class Ease.PresenterWindow
 		document = doc;
 		slide_index = -1;
 
-		stage = new Clutter.Stage ();
-		stage.title = "Presenter window";
+		this.title = "Presenter window";
+
+		var embed = new GtkClutter.Embed ();
+		this.add (embed);
+		stage = embed.get_stage () as Clutter.Stage;
+
 		stage.color = { 0, 0, 0, 255 };
 		stage.set_fullscreen (true);
 		stage.show_all ();
 	}
-}
-		
-		
+}
\ No newline at end of file



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