diff options
| author | P. F. Chimento <philip.chimento@gmail.com> | 2013-05-17 09:50:13 -0700 |
|---|---|---|
| committer | P. F. Chimento <philip.chimento@gmail.com> | 2013-05-17 09:50:13 -0700 |
| commit | ad0a9197169379abe8de5e7affcee38123c51a8b (patch) | |
| tree | d4a1fa9084fdca63593bd1dc57cd1f6f037ad50d | |
| parent | 75c141c22748b17553d7826dbe2d68e8653541a6 (diff) | |
| parent | 93e4f588a80713cebce33b7a1682c502c4835870 (diff) | |
Merge pull request #83 from endlessm/issues/69
#69
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | endless/eospagemanager.c | 18 |
2 files changed, 8 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 2841fa8..504ef11 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,7 @@ GTK_REQUIREMENT="gtk+-3.0 >= 3.4" # These go into the pkg-config file as Requires: and Requires.private: # (Generally, use Requires.private: instead of Requires:) EOS_REQUIRED_MODULES= -EOS_REQUIRED_MODULES_PRIVATE="$GLIB_REQUIREMENT $GOBJECT_REQUIREMENT $GIO_REQUIREMENT $GTK_REQUIREMENT" +EOS_REQUIRED_MODULES_PRIVATE="$GLIB_REQUIREMENT $GOBJECT_REQUIREMENT $GIO_REQUIREMENT $GTK_REQUIREMENT pstack" AC_SUBST(EOS_REQUIRED_MODULES) AC_SUBST(EOS_REQUIRED_MODULES_PRIVATE) diff --git a/endless/eospagemanager.c b/endless/eospagemanager.c index 98f6108..28eaa13 100644 --- a/endless/eospagemanager.c +++ b/endless/eospagemanager.c @@ -4,6 +4,7 @@ #include "eospagemanager.h" #include <gtk/gtk.h> +#include <pstack.h> #include <string.h> @@ -212,11 +213,8 @@ set_visible_page_from_info (EosPageManager *self, EosPageManagerPageInfo *info) { /* FIXME when porting to GtkStack */ - GtkNotebook *stack_notebook = GTK_NOTEBOOK (self->priv->stack); - int page_pos = gtk_notebook_page_num (stack_notebook, info->page); - /* Invariant: if info is not NULL, then page must be in stack */ - g_assert (page_pos != -1); - gtk_notebook_set_current_page (stack_notebook, page_pos); + PStack *stack = P_STACK (self->priv->stack); + p_stack_set_visible_child (stack, info->page); self->priv->visible_page_info = info; @@ -644,11 +642,9 @@ eos_page_manager_init (EosPageManager *self) gtk_widget_set_has_window (self_widget, FALSE); /* TODO replace with GtkStack */ - self->priv->stack = gtk_notebook_new (); - g_object_set (self->priv->stack, - "show-tabs", FALSE, - "show-border", FALSE, - NULL); + self->priv->stack = p_stack_new (); + p_stack_set_transition_type (P_STACK (self->priv->stack), + P_STACK_TRANSITION_TYPE_CROSSFADE); gtk_widget_set_parent (self->priv->stack, self_widget); } @@ -1004,4 +1000,4 @@ eos_page_manager_remove_page_by_name (EosPageManager *self, g_signal_emit_by_name (self, "remove", info->page); assert_internal_state (self); -}
\ No newline at end of file +} |