Use pannable instead of scrolled window in composer

pmo-drop-split-view-r6428

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 9efc9c9..d98fa2d 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -63,7 +63,7 @@
 #include <tny-simple-list.h>
 #include <wptextview.h>
 #include <wptextbuffer.h>
-#include "modest-scroll-area.h"
+#include <hildon/hildon-pannable-area.h>
 #include "modest-msg-edit-window-ui-dimming.h"
 
 #include "modest-hildon-includes.h"
@@ -173,8 +173,6 @@ static void text_buffer_mark_set (GtkTextBuffer *buffer,
                                  GtkTextIter *iter,
                                  GtkTextMark *mark,
                                  ModestMsgEditWindow *userdata);
-static void vadj_changed (GtkAdjustment *adj, 
-                         ModestMsgEditWindow *window);
 
 static void DEBUG_BUFFER (WPTextBuffer *buffer)
 {
@@ -266,7 +264,7 @@ struct _ModestMsgEditWindowPrivate {
 
        GtkWidget   *font_dialog;
 
-       GtkWidget   *scroll;
+       GtkWidget   *pannable;
        guint        scroll_drag_timeout_id;
        gdouble      last_upper;
 
@@ -519,10 +517,8 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focu
        GtkTextMark *insert;
        GtkTextIter iter;
        GdkRectangle rectangle;
-       GtkAdjustment *vadj;
        gdouble new_value;
        gint offset;
-       GdkWindow *window;
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w);
 
@@ -533,37 +529,11 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focu
        gtk_text_buffer_get_iter_at_mark (priv->text_buffer, &iter, insert);
 
        gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &iter, &rectangle);
-       vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll));
        offset = priv->msg_body->allocation.y;
 
-       new_value = vadj->value;
-       
-       if ((offset + rectangle.y + rectangle.height) > 
-           ((gint) (vadj->value +vadj->page_size))) {
-               new_value = (offset + rectangle.y) - vadj->page_size * 0.25;
-               if (new_value > vadj->upper - vadj->page_size)
-                       new_value = vadj->upper - vadj->page_size;
-       } else if ((offset + rectangle.y) < ((gint) vadj->value)) {
-               new_value = (offset + rectangle.y - vadj->page_size * 0.75);
-               if (((gint) (new_value + vadj->page_size)) < (offset + rectangle.y + rectangle.height))
-                       new_value = offset + rectangle.y + rectangle.height - (gint) vadj->page_size;
-               if (new_value < 0.0)
-                       new_value = 0.0;
-               if (new_value > vadj->value)
-                       new_value = vadj->value;
-       }
-
-       if (vadj->value != new_value) {
-               g_signal_emit_by_name (GTK_TEXT_VIEW(priv->msg_body)->layout,
-                                      "invalidated");
-               vadj->value = new_value;
-               gtk_adjustment_value_changed (vadj);
-               /* invalidate body */
-               window = gtk_widget_get_parent_window (priv->msg_body);
-               if (window)
-                       gdk_window_invalidate_rect (window, NULL, TRUE);
-       }
+       new_value = (offset + rectangle.y);
 
+       hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (priv->pannable), -1, new_value);
 }
 
 static void
@@ -625,20 +595,6 @@ copy_clipboard_check (GtkTextView *text_view,
        }
 }
 
-static void 
-vadj_changed (GtkAdjustment *adj,
-             ModestMsgEditWindow *window)
-{
-       ModestMsgEditWindowPrivate *priv;
-
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
-       if (priv->last_upper != adj->upper) {
-               priv->last_upper = adj->upper;
-               correct_scroll (window);
-       }
-}
-
 static void
 attachment_deleted (ModestAttachmentsView *attachments_view,
                    gpointer user_data)
@@ -701,11 +657,6 @@ connect_signals (ModestMsgEditWindow *obj)
        g_signal_connect (G_OBJECT (priv->find_toolbar), "close", G_CALLBACK (modest_msg_edit_window_find_toolbar_close), obj);
        g_signal_connect (G_OBJECT (priv->find_toolbar), "search", G_CALLBACK (modest_msg_edit_window_find_toolbar_search), obj);
 
-       g_signal_connect (G_OBJECT (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))),
-                         "changed",
-                         G_CALLBACK (vadj_changed),
-                         obj);
-
        priv->clipboard_change_handler_id = 
                g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change",
                                  G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj);
@@ -870,25 +821,21 @@ init_window (ModestMsgEditWindow *obj)
 
 /*     g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */
 
-       priv->scroll = gtk_scrolled_window_new (NULL, NULL);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scroll), GTK_SHADOW_NONE);
-       modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->scroll), TRUE);
-
+       priv->pannable = hildon_pannable_area_new ();
+       
        main_vbox = gtk_vbox_new  (FALSE, DEFAULT_MAIN_VBOX_SPACING);
 
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0);
        priv->frame = gtk_frame_new (NULL);
        gtk_box_pack_start (GTK_BOX(main_vbox), priv->frame, TRUE, TRUE, 0);
 
-       gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (priv->scroll), main_vbox);
-       gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
-       gtk_widget_show_all (GTK_WIDGET(priv->scroll));
+       hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), main_vbox);
+       gtk_widget_show_all (GTK_WIDGET(priv->pannable));
        
        window_box = gtk_vbox_new (FALSE, 0);
        gtk_container_add (GTK_CONTAINER(obj), window_box);
 
-       gtk_box_pack_start (GTK_BOX (window_box), priv->scroll, TRUE, TRUE, 0);
+       gtk_box_pack_start (GTK_BOX (window_box), priv->pannable, TRUE, TRUE, 0);
 
        gtk_container_add (GTK_CONTAINER (priv->frame), priv->msg_body);