[dualscreen] fix paned position - Issue #7

[evince.git] / shell / ev-dualscreen.c

diff --git a/shell/ev-dualscreen.c b/shell/ev-dualscreen.c
index a00338f2f12e8832e0f11d21ca87ccd09d1de04e..5cdefb8423a625cf5076f3e4a5727e0719400876 100644 (file)
--- a/shell/ev-dualscreen.c
+++ b/shell/ev-dualscreen.c
@@ -62,8 +62,8 @@ struct _EvDSCWindowPrivate {
 #define EV_DSCWINDOW_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_DSCWINDOW, EvDSCWindowPrivate))
 #define PAGE_CACHE_SIZE 52428800 /* 50MB */
-#define SIDEBAR_DEFAULT_SIZE    300
-#define MAX_PRESENTATION_TIME   1440 /*60*24: ONE DAY*/
+#define SIDEBAR_DEFAULT_SIZE    21 /* This seems like bug in gtk to me */
+#define MAX_PRESENTATION_TIME   1440 /*60*24 ONE DAY*/
 
 G_DEFINE_TYPE (EvDSCWindow, ev_dscwindow, GTK_TYPE_WINDOW)
 
@@ -176,10 +176,14 @@ ev_dscwindow_notes_interaction (GtkContainer *container, EvDSCWindow *ev_dscwind
                g_free (uri);
                if (error == NULL){
                        ev_dscwindow->priv->notes_model = ev_document_model_new ();
-                       ev_document_model_set_document (ev_dscwindow->priv->notes_model, ev_dscwindow->priv->notes_document);
-                       ev_document_model_set_continuous (ev_dscwindow->priv->notes_model, FALSE);
-                       ev_document_model_set_dual_page (ev_dscwindow->priv->notes_model, FALSE);
-                       ev_document_model_set_sizing_mode (ev_dscwindow->priv->notes_model, EV_SIZING_BEST_FIT);
+                       ev_document_model_set_document (ev_dscwindow->priv->notes_model,
+                                                       ev_dscwindow->priv->notes_document);
+                       ev_document_model_set_continuous (ev_dscwindow->priv->notes_model,
+                                                         FALSE);
+                       ev_document_model_set_dual_page (ev_dscwindow->priv->notes_model,
+                                                        FALSE);
+                       ev_document_model_set_sizing_mode (ev_dscwindow->priv->notes_model,
+                                                          EV_SIZING_BEST_FIT);
                        ev_document_model_set_page (ev_dscwindow->priv->notes_model,
                                ev_document_model_get_page (ev_dscwindow->priv->model));
                        ev_view_set_model(EV_VIEW(ev_dscwindow->priv->notesview),
@@ -294,16 +298,13 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
        ev_dscwindow->priv->notesview_scrolled_window = GTK_WIDGET (
                g_object_new (GTK_TYPE_SCROLLED_WINDOW,"shadow-type",
                                GTK_SHADOW_IN, NULL));
-       gtk_paned_pack1 (GTK_PANED (hpaned), ev_dscwindow->priv->sidebar, FALSE, TRUE);
-       gtk_paned_pack2 (GTK_PANED (hpaned), ev_dscwindow->priv->notesview_scrolled_window, TRUE, TRUE);
-       gtk_paned_set_position (GTK_PANED (hpaned), SIDEBAR_DEFAULT_SIZE);
-
        ev_dscwindow->priv->notesview = ev_view_new ();
        gtk_container_add (GTK_CONTAINER (ev_dscwindow->priv->notesview_scrolled_window),
                ev_dscwindow->priv->notesview);
-
        ev_dscwindow->priv->notes_model = ev_dscwindow->priv->model;
        ev_view_set_model (EV_VIEW (ev_dscwindow->priv->notesview), ev_dscwindow->priv->notes_model);
+       gtk_paned_pack1 (GTK_PANED (hpaned), ev_dscwindow->priv->sidebar, FALSE, TRUE);
+       gtk_paned_pack2 (GTK_PANED (hpaned), ev_dscwindow->priv->notesview_scrolled_window, FALSE, FALSE);
 
        gtk_box_pack_start(GTK_BOX(vbox),hpaned,TRUE,TRUE,0);
 
@@ -351,11 +352,13 @@ ev_dscwindow_init (EvDSCWindow *ev_dscwindow)
        GtkWidget *hpan = gtk_hpaned_new ();
        gtk_paned_pack1 (GTK_PANED(hpan), expander, FALSE, TRUE);
        ev_dscwindow->priv->timer = ev_presentation_timer_new ();
-       gtk_paned_pack2 (GTK_PANED(hpan),ev_dscwindow->priv->timer, TRUE, TRUE);
-       gtk_paned_set_position (GTK_PANED (hpan), SIDEBAR_DEFAULT_SIZE);
+       gtk_paned_pack2 (GTK_PANED(hpan),ev_dscwindow->priv->timer, FALSE, FALSE);
+
        gtk_box_pack_end (GTK_BOX (vbox), hpan, FALSE, TRUE, 0);
        gtk_container_add (GTK_CONTAINER (ev_dscwindow), vbox);
        gtk_widget_show_all(vbox);
+       gtk_paned_set_position (GTK_PANED (hpan), SIDEBAR_DEFAULT_SIZE);
+       gtk_paned_set_position (GTK_PANED (hpaned), SIDEBAR_DEFAULT_SIZE);
 }
 
 static void