X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fel-home-applet.c;h=c5853908fe8c29381f60e18aba09920f11732e56;hb=4d28752276d910690f1e41116af7f1573aaae84b;hp=8b4ec0f3ebe5baabe698ebd9137eba3513730f8b;hpb=8d23af4449f0fa68db563f56ce4c4b5d677dd2f1;p=conv-inbox diff --git a/src/el-home-applet.c b/src/el-home-applet.c index 8b4ec0f..c585390 100644 --- a/src/el-home-applet.c +++ b/src/el-home-applet.c @@ -33,7 +33,7 @@ EL_TYPE_HOME_APPLET, ELHomeAppletPrivate)) #define BOX_WIDTH 352 -#define BOX_HEIGHT 252 +#define BOX_HEIGHT 256 #define C_WIDTH (BOX_WIDTH - 2*HILDON_MARGIN_HALF) #define C_HEIGHT (BOX_HEIGHT - 2*HILDON_MARGIN_HALF) @@ -46,23 +46,32 @@ #define BOX_RADIOUS 10 +#define DEBUG_LAYOUT + struct _ELHomeAppletPrivate { RTComEl *eventlogger; GtkWidget *sender; - GtkWidget *message; GtkWidget *icon; GtkWidget *unread; GtkWidget *received; + GtkWidget *empty; - gint event_id; + gchar *message; + gint event_id; - gboolean active; + gboolean active; guint unread_count; const gchar *current_font; + + guint idle_id; + + gboolean scroll_on_click; + gint scroll_offset; + guint scroll_anim_id; }; HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM); @@ -126,6 +135,73 @@ rounded_rectangle (cairo_t *cr, } static gboolean +draw_text (cairo_t *cr, + const gchar *text, + double x, + double y, + int width, + int height, + int offset) +{ + PangoLayout *layout; + PangoFontDescription *desc; + gboolean result; + PangoRectangle extent; + + cairo_save (cr); + cairo_rectangle (cr, + x, y, width, height); + cairo_clip (cr); + + /* Create a PangoLayout, set the font and text */ + layout = pango_cairo_create_layout (cr); + pango_layout_set_text (layout, + text, + -1); + desc = pango_font_description_from_string ("Sans 17"); + pango_layout_set_font_description (layout, desc); + pango_font_description_free (desc); + + pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR); + if (!offset) + pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); + pango_layout_set_width (layout, PANGO_SCALE*width); + pango_layout_set_height (layout, PANGO_SCALE*height); + + /* draw shadow */ + cairo_move_to (cr, x + 1, y + 1 - offset); + cairo_set_source_rgba (cr, 0.2, 0.2, 0.2, 0.8); + pango_cairo_show_layout (cr, layout); + + /* draw fg */ + cairo_move_to (cr, x, y - offset); + cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0); + pango_cairo_show_layout (cr, layout); + + pango_layout_get_pixel_extents (layout, NULL, &extent); + if (offset) + result = height < (extent.height - offset); + else + result = pango_layout_is_ellipsized (layout); + + g_object_unref (layout); + cairo_restore (cr); + + return result; +} + +static void +stop_scroll_anim (ELHomeAppletPrivate *priv) +{ + priv->scroll_on_click = FALSE; + priv->scroll_offset = 0; + if (priv->scroll_anim_id > 0) { + g_source_remove (priv->scroll_anim_id); + priv->scroll_anim_id = 0; + } +} + +static gboolean expose_event (GtkWidget *self, GdkEventExpose *event) { ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv; @@ -133,6 +209,9 @@ expose_event (GtkWidget *self, GdkEventExpose *event) cairo_t *cr; GdkColor color; float red, green, blue; + int message_height; + + message_height = C_HEIGHT - priv->received->allocation.height - HEADER_HEIGHT; /* find theme active color */ gtk_style_lookup_color (self->style, "ActiveTextColor", &color); @@ -144,6 +223,7 @@ expose_event (GtkWidget *self, GdkEventExpose *event) gdk_cairo_region (cr, event->region); cairo_clip (cr); + /* draw bound box */ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); cairo_set_source_rgba (cr, 0.4f, 0.4f, 0.4f, 0.1f); @@ -159,6 +239,7 @@ expose_event (GtkWidget *self, GdkEventExpose *event) cairo_close_path(cr); cairo_stroke (cr); + /* draw header */ cairo_set_line_width (cr, 1.0f); cairo_translate (cr, C_X, C_Y); @@ -177,6 +258,7 @@ expose_event (GtkWidget *self, GdkEventExpose *event) cairo_set_source_rgba (cr, red, green, blue, 1.0f); cairo_stroke (cr); + /* draw body */ cairo_move_to (cr, 0, HEADER_HEIGHT); cairo_line_to (cr, 0, C_HEIGHT - BOX_RADIOUS); cairo_curve_to (cr, 0, C_HEIGHT, 0, C_HEIGHT, BOX_RADIOUS, C_HEIGHT); @@ -186,10 +268,24 @@ expose_event (GtkWidget *self, GdkEventExpose *event) cairo_line_to (cr, 0, HEADER_HEIGHT); cairo_close_path(cr); - if (priv->active) - cairo_set_source_rgba (cr, red, green, blue, 0.8f); - else - cairo_set_source_rgba (cr, 0.4f, 0.4f, 0.4f, 0.8f); + /* draw body filling depending on (in)active state */ + cairo_pattern_t *grad; + grad = cairo_pattern_create_linear(0, HEADER_HEIGHT, + 0, C_HEIGHT); + + if (priv->active){ + cairo_pattern_add_color_stop_rgba (grad, 0.5f, + red, green, blue, 0.8f); + cairo_pattern_add_color_stop_rgba (grad, 1.0f, + red/2, green/2, blue/2, 0.8f); + } + else { + cairo_pattern_add_color_stop_rgba (grad, 0.5f, + 0.4f, 0.4f, 0.4f, 0.8f); + cairo_pattern_add_color_stop_rgba (grad, 1.0f, + 0.2f, 0.2f, 0.2f, 0.8f); + } + cairo_set_source (cr, grad); cairo_fill (cr); /* cairo_set_source_rgba (cr, red, green, blue, 1.0f); */ @@ -203,8 +299,22 @@ expose_event (GtkWidget *self, GdkEventExpose *event) /* cairo_close_path(cr); */ /* cairo_stroke (cr); */ + /* draw message */ + gboolean ellipsized; + ellipsized = draw_text (cr, priv->message, + 2*C_X, HEADER_HEIGHT, + MESSAGE_WIDTH, + message_height, + priv->scroll_offset); + if (!priv->scroll_offset && !priv->active) + priv->scroll_on_click = ellipsized; + + cairo_pattern_destroy (grad); cairo_destroy (cr); + if (!priv->scroll_on_click && !ellipsized && priv->scroll_offset) + stop_scroll_anim (priv); + return GTK_WIDGET_CLASS (el_home_applet_parent_class)->expose_event (self, event); } @@ -213,11 +323,21 @@ dispose (GObject *self) { ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv; + stop_scroll_anim (priv); + if (priv->idle_id){ + g_source_remove (priv->idle_id); + priv->idle_id = 0; + } if (priv->eventlogger){ g_object_unref (priv->eventlogger); priv->eventlogger = NULL; } + if (priv->message){ + g_free (priv->message); + priv->message = NULL; + } + G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self); } @@ -256,14 +376,18 @@ show_event (ELHomeApplet *self, RTComElIter *it) { ELHomeAppletPrivate *priv = self->priv; - gchar *message = NULL; gchar *remote = NULL; gchar *received = NULL; const gchar *icon_name = NULL; + if (priv->message) { + g_free (priv->message); + priv->message = NULL; + } + if (it && rtcom_el_iter_first (it)){ - rtcom_el_iter_dup_string (it, "free-text", &message); - if (message){ + rtcom_el_iter_dup_string (it, "free-text", &priv->message); + if (priv->message){ const gchar *service; time_t received_t; @@ -284,7 +408,11 @@ show_event (ELHomeApplet *self, RTComElIter *it) priv->event_id = -1; } - gtk_label_set_text (GTK_LABEL (priv->message), message); + if (priv->message) + gtk_widget_hide (priv->empty); + else + gtk_widget_show (priv->empty); + gtk_label_set_text (GTK_LABEL (priv->sender), remote); gtk_label_set_text (GTK_LABEL (priv->received), received); @@ -302,8 +430,9 @@ show_event (ELHomeApplet *self, RTComElIter *it) else gtk_widget_hide (priv->icon); - g_free (message); g_free (remote); + + gtk_widget_queue_draw (GTK_WIDGET (self)); } static RTComElIter* @@ -348,9 +477,13 @@ update_unread_label (ELHomeApplet *self) ELHomeAppletPrivate *priv = self->priv; gchar *text; - text = g_strdup_printf ("%d", priv->unread_count); - gtk_label_set_text (GTK_LABEL (priv->unread), text); - g_free (text); + if (priv->unread_count > 0){ + text = g_strdup_printf ("%d", priv->unread_count); + gtk_label_set_text (GTK_LABEL (priv->unread), text); + g_free (text); + } + else + gtk_label_set_text (GTK_LABEL (priv->unread), NULL); } static gint @@ -413,6 +546,31 @@ mark_as_read (ELHomeApplet *self) } } +static gboolean +read_new_event (ELHomeApplet *self) +{ + ELHomeAppletPrivate *priv = self->priv; + + read_event (self); + priv->unread_count = query_unread_events (priv->eventlogger); + update_unread_label (self); + + priv->idle_id = 0; + + return FALSE; +} + +static void +add_new_idle (ELHomeApplet *self) +{ + ELHomeAppletPrivate *priv = self->priv; + + if (priv->idle_id) + g_source_remove (priv->idle_id); + priv->idle_id = g_idle_add ((GSourceFunc)read_new_event, + self); +} + static void new_event_cb (RTComEl *backend, gint event_id, @@ -423,66 +581,56 @@ new_event_cb (RTComEl *backend, const gchar *service, ELHomeApplet *self) { - ELHomeAppletPrivate *priv = self->priv; - RTComElIter *it = NULL; - - it = make_query (priv->eventlogger, event_id); - if (it){ - if (rtcom_el_iter_first (it)){ - show_event (self, it); - priv->unread_count++; - update_unread_label (self); - } - g_object_unref (it); - } + add_new_idle (self); } -static void -event_updated_cb (RTComEl *backend, - gint event_id, - const gchar *local_uid, - const gchar *remote_uid, - const gchar *remote_ebook_uid, - const gchar *group_uid, - const gchar *service, - ELHomeApplet *self) +static gboolean +scroll_anim_cb (ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - if (event_id == priv->event_id) - read_event (self); + priv->scroll_offset += 1; + gtk_widget_queue_draw (self); - priv->unread_count = query_unread_events (priv->eventlogger); - update_unread_label (self); + return TRUE; } static gboolean -button_release_event_cb (GtkWidget *widget, - GdkEventButton *event, - ELHomeApplet *self) +button_press_event_cb (GtkWidget *widget, + GdkEventButton *event, + ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - if (priv->active){ - priv->active = FALSE; + if (priv->event_id > 0){ + priv->active = TRUE; gtk_widget_queue_draw (widget); -#ifndef DEBUG_LAYOUT - mark_as_read (self); -#endif + } + priv->active = TRUE; + if (priv->scroll_on_click) { + stop_scroll_anim (priv); + priv->scroll_anim_id = g_timeout_add (100, + scroll_anim_cb, + self); } + gtk_widget_queue_draw (widget); return TRUE; } static gboolean -button_press_event_cb (GtkWidget *widget, - GdkEventButton *event, - ELHomeApplet *self) +button_release_event_cb (GtkWidget *widget, + GdkEventButton *event, + ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - if (priv->event_id > 0){ - priv->active = TRUE; + if (priv->active){ + priv->active = FALSE; + /* stop_scroll_anim (priv); */ +#ifndef DEBUG_LAYOUT + mark_as_read (self); +#endif gtk_widget_queue_draw (widget); } @@ -498,6 +646,7 @@ leave_notify_event_cb (GtkWidget *widget, if (priv->active){ priv->active = FALSE; + stop_scroll_anim (priv); gtk_widget_queue_draw (widget); } @@ -543,19 +692,17 @@ el_home_applet_init (ELHomeApplet *self) gtk_widget_set_name (priv->sender, "hildon-shadow-label"); hildon_helper_set_logical_font (priv->sender, "SystemFont"); - priv->message = g_object_new (GTK_TYPE_LABEL, - "label", "asdf asdf adsf asdf asdf asdf asdf asdf", - "wrap", TRUE, - "wrap-mode", PANGO_WRAP_WORD_CHAR, - NULL); + priv->message = g_strdup ("One two three four five six seven eight nine ten" + "one two three four five six seven eight nine ten" + "one two three four five six seven eight nine ten" + "one two three four five six seven eight nine ten" + "one two three four five six seven eight nine ten" + "one two three four five six seven eight nine ten"); - gtk_misc_set_alignment (GTK_MISC (priv->message), - 0.0f, - 0.0f); - gtk_widget_set_size_request (priv->message, - MESSAGE_WIDTH, - MESSAGE_HEIGHT); - gtk_widget_set_name (priv->message, "hildon-shadow-label"); + /* TODO: l10n */ + priv->empty = gtk_label_new ("No new messages"); + gtk_widget_set_name (priv->empty, "hildon-shadow-label"); + GTK_WIDGET_SET_FLAGS (priv->empty, GTK_NO_SHOW_ALL); priv->received = gtk_label_new ("aewf aewf aewf awef"); gtk_misc_set_alignment (GTK_MISC (priv->received), @@ -574,8 +721,8 @@ el_home_applet_init (ELHomeApplet *self) vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), priv->message, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), priv->received, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), priv->empty, TRUE, TRUE, 0); + gtk_box_pack_end (GTK_BOX (vbox), priv->received, FALSE, FALSE, 0); align = gtk_alignment_new (0.5f, 0.0f, 1.0f, 1.0f); gtk_alignment_set_padding (GTK_ALIGNMENT (align), @@ -608,12 +755,10 @@ el_home_applet_init (ELHomeApplet *self) self); g_signal_connect (priv->eventlogger, "event-updated", - G_CALLBACK (event_updated_cb), + G_CALLBACK (new_event_cb), self); - read_event (self); - priv->unread_count = query_unread_events (priv->eventlogger); - update_unread_label (self); + read_new_event (self); #endif }