[glide] Insert a GlideSlideBox in the main window
- From: Robert Carr <racarr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glide] Insert a GlideSlideBox in the main window
- Date: Thu, 29 Apr 2010 08:41:16 +0000 (UTC)
commit 0a02e8c85482a68b1b5200f4622d7840c5800e29
Author: Robert Carr <racarr Valentine localdomain>
Date: Thu Apr 29 02:06:45 2010 -0400
Insert a GlideSlideBox in the main window
src/glide-slide-box.c | 2 ++
src/glide-window.c | 11 +++++++----
2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/glide-slide-box.c b/src/glide-slide-box.c
index 626e3d1..9319cfa 100644
--- a/src/glide-slide-box.c
+++ b/src/glide-slide-box.c
@@ -32,6 +32,8 @@ glide_slide_box_finalize (GObject *object)
static void
glide_slide_box_init (GlideSlideBox *box)
{
+ GdkColor white;
+
box->priv = GLIDE_SLIDE_BOX_GET_PRIVATE (box);
}
diff --git a/src/glide-window.c b/src/glide-window.c
index 60bcf20..fbf0c9b 100644
--- a/src/glide-window.c
+++ b/src/glide-window.c
@@ -43,6 +43,8 @@
#include "glide-animation-manager.h"
+#include "glide-slide-box.h"
+
#define GLIDE_WINDOW_UI_OBJECT(w, obj) (gtk_builder_get_object (w->priv->builder, obj))
@@ -641,9 +643,6 @@ glide_window_insert_stage (GlideWindow *w)
gdk_color_parse ("black", &black);
gtk_widget_modify_bg (fixed, GTK_STATE_NORMAL, &black);
- gdk_color_parse ("white", &black);
- gtk_widget_modify_bg (GTK_WIDGET (GLIDE_WINDOW_UI_OBJECT (w, "slide-pane-viewport")), GTK_STATE_NORMAL, &black);
-
w->priv->embed = embed;
w->priv->stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (embed));
@@ -1472,7 +1471,7 @@ static void
glide_window_load_ui (GlideWindow *w)
{
GtkBuilder *b = gtk_builder_new ();
- GtkWidget *main_box;
+ GtkWidget *main_box, *slide_box;
gchar *ui_dir = glide_dirs_get_glide_ui_dir ();
gchar *ui_path = g_strconcat (ui_dir, "/glide-window.ui", NULL);
@@ -1491,6 +1490,10 @@ glide_window_load_ui (GlideWindow *w)
main_box = GTK_WIDGET (gtk_builder_get_object (b, "main-vbox"));
gtk_widget_reparent (main_box, GTK_WIDGET (w));
+
+ slide_box = glide_slide_box_new ();
+ gtk_container_add (GTK_CONTAINER (GLIDE_WINDOW_UI_OBJECT (w, "slide-pane-viewport")), slide_box);
+ gtk_widget_show (slide_box);
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]