gdouble zoom);
static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data);
-static void _make_zoom_buttons_grabeable (GtkWidget* widget);
-static gboolean _modest_window_map_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer userdata);
+
static void modest_window_pack_toolbar_not_implemented (ModestWindow *self,
GtkPackType pack_type,
GtkWidget *toolbar);
-
-
/* list my signals */
enum {
LAST_SIGNAL
g_signal_connect (G_OBJECT (obj),
"key-press-event",
G_CALLBACK (on_key_pressed), NULL);
- g_signal_connect (G_OBJECT (obj), "map-event",
- G_CALLBACK (_modest_window_map_event),
- G_OBJECT (obj));
}
static void
modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
return TRUE;
#ifdef MODEST_TOOLKIT_HILDON2
- case HILDON_HARDKEY_INCREASE:
- modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
- return TRUE;
- case HILDON_HARDKEY_DECREASE:
- modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self));
- return TRUE;
+ case HILDON_HARDKEY_INCREASE:
+ if (MODEST_IS_MSG_VIEW_WINDOW (self)) {
+ modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
+ return TRUE;
+ }
+ break;
+ case HILDON_HARDKEY_DECREASE:
+ if (MODEST_IS_MSG_VIEW_WINDOW (self)) {
+ modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self));
+ return TRUE;
+ }
+ break;
#else
case GDK_F7:
modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
return TRUE;
#endif
case GDK_Escape:
- if (modest_window_mgr_get_fullscreen_mode (mgr))
+ if (modest_window_mgr_get_fullscreen_mode (mgr)) {
modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
- else if (MODEST_IS_MSG_VIEW_WINDOW (self))
+ return TRUE;
+ } else {
+#ifdef MODEST_TOOLKIT_HILDON2
+ if (MODEST_IS_MSG_VIEW_WINDOW (self)) {
+ modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
+ return TRUE;
+ }
+#else
modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
+ return TRUE;
+#endif
+ }
break;
}
-
- return FALSE;
-}
-static gboolean
-_modest_window_map_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer userdata)
-{
- _make_zoom_buttons_grabeable (GTK_WIDGET (widget));
return FALSE;
}
static void
-_make_zoom_buttons_grabeable (GtkWidget* widget)
-{
- GdkDisplay *display;
- Atom atom;
- unsigned long val = 1;
-
- display = gdk_drawable_get_display (widget->window);
- atom = gdk_x11_get_xatom_by_name_for_display (display, "_HILDON_ZOOM_KEY_ATOM");
- XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XID (widget->window), atom,
- XA_INTEGER, 32, PropModeReplace,
- (unsigned char *) &val, 1);
-}
-
-static void
modest_window_pack_toolbar_not_implemented (ModestWindow *self,
GtkPackType pack_type,
GtkWidget *toolbar)
MODEST_WINDOW_GET_CLASS (self)->pack_toolbar_func (self, pack_type, toolbar);
}
-