#define DEFAULT_SIZE_COMBOBOX_WIDTH 80
#define DEFAULT_MAIN_VBOX_SPACING 6
#define SUBJECT_MAX_LENGTH 1000
-#define IMAGE_MAX_WIDTH 608
+#define IMAGE_MAX_WIDTH 560
#define DEFAULT_FONT_SCALE 1.5
static void modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass);
ModestMsgEditWindow *window);
/* ModestWindow methods implementation */
-static void modest_msg_edit_window_set_zoom (ModestWindow *window, gdouble zoom);
+static void modest_msg_edit_window_disconnect_signals (ModestWindow *window);
+static void modest_msg_edit_window_set_zoom (ModestWindow *window, gdouble zoom);
static gdouble modest_msg_edit_window_get_zoom (ModestWindow *window);
static gboolean modest_msg_edit_window_zoom_minus (ModestWindow *window);
static gboolean modest_msg_edit_window_zoom_plus (ModestWindow *window);
GtkWidget *scroll;
GtkWidget *scroll_area;
+ gint last_vadj_upper;
gint last_cid;
GList *attachments;
modest_window_class->zoom_minus_func = modest_msg_edit_window_zoom_minus;
modest_window_class->show_toolbar_func = modest_msg_edit_window_show_toolbar;
modest_window_class->save_state_func = save_state;
+ modest_window_class->disconnect_signals_func = modest_msg_edit_window_disconnect_signals;
g_type_class_add_private (gobject_class, sizeof(ModestMsgEditWindowPrivate));
-
-
}
static void
priv->outbox_msg = NULL;
priv->clipboard_change_handler_id = 0;
priv->sent = FALSE;
+
+ priv->last_vadj_upper = 0;
}
return transports;
}
+void vadj_changed (GtkAdjustment *adj,
+ ModestMsgEditWindow *window)
+{
+ ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+ GdkRectangle rectangle, cursor_rectangle;
+ GtkTextIter position;
+ gboolean visible;
+ gint cursor_bottom;
+
+ /* We detect if cursor is visible using the full height, not only the center. This
+ seems to work */
+ gtk_text_view_get_visible_rect (GTK_TEXT_VIEW (priv->msg_body), &rectangle);
+ gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer),
+ &position,
+ gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer)));
+ gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &position, &cursor_rectangle);
+
+ cursor_bottom = (cursor_rectangle.y + cursor_rectangle.height);
+ visible = (cursor_rectangle.y >= rectangle.y) && (cursor_bottom < (rectangle.y + rectangle.height));
+
+ if (gtk_widget_is_focus (priv->msg_body) &&
+ !visible) {
+ if (priv->last_vadj_upper != adj->upper) {
+ GtkTextMark *insert;
+
+ insert = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer));
+ gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (priv->msg_body),
+ insert, 0.1, FALSE, 0.0, 0.0);
+ }
+ }
+ priv->last_vadj_upper = adj->upper;
+}
+
static void
init_window (ModestMsgEditWindow *obj)
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)));
+ g_signal_connect (G_OBJECT (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll))),
+ "changed",
+ G_CALLBACK (vadj_changed),
+ obj);
gtk_widget_show_all (GTK_WIDGET(priv->scroll));
window_box = gtk_vbox_new (FALSE, 0);
priv->scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body);
gtk_container_add (GTK_CONTAINER (frame), priv->scroll_area);
- gtk_container_set_focus_vadjustment (GTK_CONTAINER (priv->scroll_area),
- gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
-
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);
}
+static void
+modest_msg_edit_window_disconnect_signals (ModestWindow *window)
+{
+ ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+ if (g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_PRIMARY),
+ priv->clipboard_change_handler_id))
+ g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY),
+ priv->clipboard_change_handler_id);
+}
static void
modest_msg_edit_window_finalize (GObject *obj)
{
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj);
- if (priv->clipboard_change_handler_id > 0) {
- g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY), priv->clipboard_change_handler_id);
- priv->clipboard_change_handler_id = 0;
- }
+ /* Sanity check: shouldn't be needed, the window mgr should
+ call this function before */
+ modest_msg_edit_window_disconnect_signals (MODEST_WINDOW (obj));
if (priv->draft_msg != NULL) {
TnyHeader *header = tny_msg_get_header (priv->draft_msg);
g_object_unref (stream);
if (pixbuf != NULL) {
- wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf);
+/* wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf); */
g_object_unref (pixbuf);
}
}