Add window_present() since we don't want to reset the scrollbars when an existing window is presented

3 files changed, 10 insertions, 3 deletions

diff --git a/siv.c b/siv.c
index ae97cda..c4c4981 100644
--- a/siv.c
+++ b/siv.c
@@ -379,7 +379,7 @@ open_file (App *app, const char *filename, GPtrArray *err_files)
 
 	if (window_matches_file (w, filename))
 	{
-	    window_show (w, GDK_CURRENT_TIME);
+	    window_present (w, GDK_CURRENT_TIME);
 	    return TRUE;
 	}
     }
diff --git a/siv.h b/siv.h
index abc4461..be40cd3 100644
--- a/siv.h
+++ b/siv.h
@@ -69,9 +69,10 @@ SivWindow * window_new          (App         *app);
 gboolean    window_load_file    (SivWindow   *window,
 				 const char  *file,
 				 GError     **err);
+void        window_present      (SivWindow   *window,
+				 guint32      time);
 void        window_show         (SivWindow   *window,
 				 guint32      time);
-void        window_present      (SivWindow   *window);
 gboolean    window_matches_file (SivWindow   *window,
 				 const char  *filename);
 gboolean    window_is_blank     (SivWindow   *window);
diff --git a/window.c b/window.c
index 6a1cb72..f15f6ef 100644
--- a/window.c
+++ b/window.c
@@ -1204,6 +1204,12 @@ window_free (SivWindow *window)
 }
 
 void
+window_present (SivWindow *window, guint32 time)
+{
+    gtk_window_present_with_time (get_widget (window, "main_window"), time);
+}
+
+void
 window_show (SivWindow *window, guint32 time)
 {
     GtkAdjustment *vadj, *hadj;
@@ -1222,7 +1228,7 @@ window_show (SivWindow *window, guint32 time)
     gtk_adjustment_set_value (vadj, window->vadj);
     gtk_adjustment_set_value (hadj, window->hadj);
 
-    gtk_window_present_with_time (get_widget (window, "main_window"), time);
+    window_present (window, time);
 }
 
 gboolean