static void check_dimming_rules_after_change (ModestMsgViewWindow *window);
+static gboolean modest_msg_view_window_scroll_child (ModestMsgViewWindow *self,
+ GtkScrollType scroll_type,
+ gboolean horizontal,
+ gpointer userdata);
+
/* list my signals */
enum {
MSG_CHANGED_SIGNAL,
+ SCROLL_CHILD_SIGNAL,
LAST_SIGNAL
};
MODEST_CONF_MSG_VIEW_WINDOW_KEY);
}
+static gboolean modest_msg_view_window_scroll_child (ModestMsgViewWindow *self,
+ GtkScrollType scroll_type,
+ gboolean horizontal,
+ gpointer userdata)
+{
+ ModestMsgViewWindowPrivate *priv;
+ gboolean return_value;
+
+ priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
+ g_signal_emit_by_name (priv->main_scroll, "scroll-child", scroll_type, horizontal, &return_value);
+ return return_value;
+}
+
+static void
+add_scroll_binding (GtkBindingSet *binding_set,
+ guint keyval,
+ GtkScrollType scroll)
+{
+ guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
+
+ gtk_binding_entry_add_signal (binding_set, keyval, 0,
+ "scroll_child", 2,
+ GTK_TYPE_SCROLL_TYPE, scroll,
+ G_TYPE_BOOLEAN, FALSE);
+ gtk_binding_entry_add_signal (binding_set, keypad_keyval, 0,
+ "scroll_child", 2,
+ GTK_TYPE_SCROLL_TYPE, scroll,
+ G_TYPE_BOOLEAN, FALSE);
+}
+
static void
modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass)
{
GObjectClass *gobject_class;
ModestWindowClass *modest_window_class;
+ GtkBindingSet *binding_set;
+
gobject_class = (GObjectClass*) klass;
modest_window_class = (ModestWindowClass *) klass;
modest_window_class->show_toolbar_func = modest_msg_view_window_show_toolbar;
modest_window_class->disconnect_signals_func = modest_msg_view_window_disconnect_signals;
- g_type_class_add_private (gobject_class, sizeof(ModestMsgViewWindowPrivate));
-
modest_window_class->save_state_func = save_state;
+ klass->scroll_child = modest_msg_view_window_scroll_child;
+
signals[MSG_CHANGED_SIGNAL] =
g_signal_new ("msg-changed",
G_TYPE_FROM_CLASS (gobject_class),
NULL, NULL,
modest_marshal_VOID__POINTER_POINTER,
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
+
+ signals[SCROLL_CHILD_SIGNAL] =
+ g_signal_new ("scroll-child",
+ G_TYPE_FROM_CLASS (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (ModestMsgViewWindowClass, scroll_child),
+ NULL, NULL,
+ modest_marshal_BOOLEAN__ENUM_BOOLEAN,
+ G_TYPE_BOOLEAN, 2, GTK_TYPE_SCROLL_TYPE, G_TYPE_BOOLEAN);
+
+ binding_set = gtk_binding_set_by_class (klass);
+ add_scroll_binding (binding_set, GDK_Up, GTK_SCROLL_STEP_UP);
+ add_scroll_binding (binding_set, GDK_Down, GTK_SCROLL_STEP_DOWN);
+ add_scroll_binding (binding_set, GDK_Page_Up, GTK_SCROLL_PAGE_UP);
+ add_scroll_binding (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_DOWN);
+ add_scroll_binding (binding_set, GDK_Home, GTK_SCROLL_START);
+ add_scroll_binding (binding_set, GDK_End, GTK_SCROLL_END);
+
+ g_type_class_add_private (gobject_class, sizeof(ModestMsgViewWindowPrivate));
+
}
static void modest_header_view_observer_init(
event->keyval == GDK_Page_Down || event->keyval == GDK_KP_Page_Down ||
event->keyval == GDK_Home || event->keyval == GDK_KP_Home ||
event->keyval == GDK_End || event->keyval == GDK_KP_End) {
- ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
- gboolean return_value;
+ /* ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); */
+ /* gboolean return_value; */
- if (event->type == GDK_KEY_RELEASE) {
+ if (event->type == GDK_KEY_PRESS) {
GtkScrollType scroll_type;
switch (event->keyval) {
default: scroll_type = GTK_SCROLL_NONE;
}
- g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child",
- scroll_type, FALSE, &return_value);
- return TRUE;
+ /* g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", */
+ /* scroll_type, FALSE, &return_value); */
+ return FALSE;
} else {
return FALSE;
}
VOID:POINTER,INT
BOOL:STRING
BOOL:STRING,OBJECT
+BOOL:ENUM,BOOL
modest_gtkhtml_mime_part_view_class_init (ModestGtkhtmlMimePartViewClass *klass)
{
GObjectClass *gobject_class;
+ GtkBindingSet *binding_set;
+
gobject_class = (GObjectClass*) klass;
parent_class = g_type_class_peek_parent (klass);
klass->search_func = modest_gtkhtml_mime_part_view_search_default;
klass->search_next_func = modest_gtkhtml_mime_part_view_search_next_default;
klass->get_selection_area_func = modest_gtkhtml_mime_part_view_get_selection_area_default;
+
+ binding_set = gtk_binding_set_by_class (klass);
+ gtk_binding_entry_skip (binding_set, GDK_Down, 0);
+ gtk_binding_entry_skip (binding_set, GDK_Up, 0);
+ gtk_binding_entry_skip (binding_set, GDK_KP_Up, 0);
+ gtk_binding_entry_skip (binding_set, GDK_KP_Down, 0);
+ gtk_binding_entry_skip (binding_set, GDK_Page_Down, 0);
+ gtk_binding_entry_skip (binding_set, GDK_Page_Up, 0);
+ gtk_binding_entry_skip (binding_set, GDK_KP_Page_Up, 0);
+ gtk_binding_entry_skip (binding_set, GDK_KP_Page_Down, 0);
+ gtk_binding_entry_skip (binding_set, GDK_Home, 0);
+ gtk_binding_entry_skip (binding_set, GDK_End, 0);
+ gtk_binding_entry_skip (binding_set, GDK_KP_Home, 0);
+ gtk_binding_entry_skip (binding_set, GDK_KP_End, 0);
g_type_class_add_private (gobject_class, sizeof(ModestGtkhtmlMimePartViewPrivate));
gpointer userdata);
#endif
+static gboolean
+button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer userdata);
+static gboolean
+button_release_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer userdata);
+
/* GtkContainer methods */
static void forall (GtkContainer *container, gboolean include_internals,
GtkCallback callback, gpointer userdata);
GdkWindow *headers_window;
GdkWindow *html_window;
+ /* id handler for dragged scroll */
+ guint idle_motion_id;
+
/* zoom */
gdouble current_zoom;
priv->headers_window = NULL;
priv->html_window = NULL;
+ priv->idle_motion_id = 0;
+
gtk_widget_push_composite_child ();
priv->html_scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_composite_name (priv->html_scroll, "contents");
g_signal_connect (G_OBJECT(priv->body_view), "motion-notify-event",
G_CALLBACK (motion_notify_event), obj);
#endif
+ g_signal_connect (G_OBJECT (priv->body_view), "button-press-event",
+ G_CALLBACK (button_press_event), obj);
+ g_signal_connect (G_OBJECT (priv->body_view), "button-release-event",
+ G_CALLBACK (button_release_event), obj);
g_signal_connect (G_OBJECT (priv->mail_header_view), "recpt-activated",
G_CALLBACK (on_recpt_activated), obj);
g_object_unref (G_OBJECT(priv->msg));
priv->msg = NULL;
}
+
+ if (priv->idle_motion_id > 0) {
+ g_source_remove (priv->idle_motion_id);
+ priv->idle_motion_id = 0;
+ }
/* we cannot disconnect sigs, because priv->body_view is
* already dead */
value = priv->vadj->upper - priv->vadj->page_size;
gtk_adjustment_set_value (priv->vadj, value);
- }
+ }
return FALSE;
}
#endif
+static gboolean
+idle_motion (gpointer userdata)
+{
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata);
+ if (GTK_HTML (priv->body_view)->in_selection_drag) {
+ gdouble offset;
+ GtkAdjustment *adj;
+ gint gdk_y;
+ gdk_window_get_pointer (gtk_widget_get_parent_window (priv->body_view), NULL, &gdk_y, NULL);
+ offset= (gdouble) (priv->headers_box->requisition.height + gdk_y);
+ adj = GTK_ADJUSTMENT (priv->vadj);
+ if (offset < adj->value + adj->step_increment) {
+ gtk_adjustment_set_value (adj, MAX (offset + adj->page_increment - adj->page_size, 0.0));
+ } else if (offset > adj->value + adj->page_increment) {
+ gtk_adjustment_set_value (adj, MIN (offset - adj->page_increment, adj->upper - adj->page_size));
+ }
+ gtk_widget_queue_resize (userdata);
+ }
+ return TRUE;
+}
+
+static gboolean
+button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer userdata)
+{
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata);
+
+ if (priv->idle_motion_id == 0) {
+ priv->idle_motion_id = g_timeout_add (200, idle_motion, userdata);
+ }
+ return FALSE;
+}
+
+static gboolean
+button_release_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer userdata)
+{
+ ModestGtkhtmlMsgViewPrivate *priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (userdata);
+
+ if (priv->idle_motion_id > 0) {
+ gint gdk_y;
+ g_source_remove (priv->idle_motion_id);
+
+ priv->idle_motion_id = 0;;
+ gdk_window_get_pointer (gtk_widget_get_parent_window (priv->body_view), NULL, &gdk_y, NULL);
+ event->y = (gdouble) gdk_y;
+ }
+ return FALSE;
+}
+
static GtkAdjustment *
get_vadjustment (ModestGtkhtmlMsgView *self)
{
GtkTreePath * last_path;
if (gtk_tree_selection_count_selected_rows (sel) != 1) {
moved_selection = TRUE;
- g_message ("MULTISELECTION %d -> MOVED", gtk_tree_selection_count_selected_rows (sel));
} else {
GList *rows;
rows = gtk_tree_selection_get_selected_rows (sel, NULL);
last_path = gtk_tree_row_reference_get_path (priv->autoselect_reference);
- g_message ("SELECTION PATH %s LAST PATH %s", gtk_tree_path_to_string (rows->data), gtk_tree_path_to_string (last_path));
if (gtk_tree_path_compare (last_path, (GtkTreePath *) rows->data) != 0)
moved_selection = TRUE;
g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
GtkTreePath *current_path;
current_path = gtk_tree_model_get_path (model, &tree_iter);
last_path = gtk_tree_row_reference_get_path (priv->autoselect_reference);
- g_message ("CURRENT PATH %s LAST PATH %s", gtk_tree_path_to_string (current_path), gtk_tree_path_to_string (last_path));
if (gtk_tree_path_compare (current_path, last_path) != 0) {
g_object_set(header_view, "can-focus", FALSE, NULL);
gtk_tree_selection_unselect_all (sel);
#include <tny-folder.h>
#include <widgets/modest-window.h>
#include <gtk/gtktreemodel.h>
+#include <gtk/gtkenums.h>
G_BEGIN_DECLS
GtkTreeModel *model,
GtkTreeRowReference *row_reference,
gpointer user_data);
+
+ gboolean (*scroll_child) (ModestMsgViewWindow *self,
+ GtkScrollType scroll_type,
+ gboolean horizontal,
+ gpointer userdata);
} ModestMsgViewWindowClass;
/**