EL_TYPE_HOME_APPLET, ELHomeAppletPrivate))
#define BOX_WIDTH 352
-#define BOX_HEIGHT 266
+#define BOX_HEIGHT 256
#define C_WIDTH (BOX_WIDTH - 2*HILDON_MARGIN_HALF)
#define C_HEIGHT (BOX_HEIGHT - 2*HILDON_MARGIN_HALF)
#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);
}
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;
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);
/* BOX_RADIOUS); */
/* 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);
}
{
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;
priv->eventlogger = NULL;
}
+ if (priv->message){
+ g_free (priv->message);
+ priv->message = NULL;
+ }
+
G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self);
}
{
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;
priv->event_id = -1;
}
- if (message){
- if (!GTK_WIDGET_VISIBLE (priv->message))
- gtk_widget_show (priv->message);
- gtk_label_set_text (GTK_LABEL (priv->message), message);
- }
- else{
- gtk_widget_hide (priv->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);
else
gtk_widget_hide (priv->icon);
- g_free (message);
g_free (remote);
+
+ gtk_widget_queue_draw (GTK_WIDGET (self));
}
static RTComElIter*
}
static gboolean
-button_release_event_cb (GtkWidget *widget,
- GdkEventButton *event,
- ELHomeApplet *self)
+scroll_anim_cb (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
- if (priv->active){
- priv->active = FALSE;
- gtk_widget_queue_draw (widget);
-#ifndef DEBUG_LAYOUT
- mark_as_read (self);
-#endif
- }
+ priv->scroll_offset += 1;
+ gtk_widget_queue_draw (self);
return TRUE;
}
priv->active = TRUE;
gtk_widget_queue_draw (widget);
}
+ 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_release_event_cb (GtkWidget *widget,
+ GdkEventButton *event,
+ ELHomeApplet *self)
+{
+ ELHomeAppletPrivate *priv = self->priv;
+
+ if (priv->active){
+ priv->active = FALSE;
+ /* stop_scroll_anim (priv); */
+#ifndef DEBUG_LAYOUT
+ mark_as_read (self);
+#endif
+ gtk_widget_queue_draw (widget);
+ }
return TRUE;
}
if (priv->active){
priv->active = FALSE;
+ stop_scroll_anim (priv);
gtk_widget_queue_draw (widget);
}
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);
-
- 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");
+ 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");
/* TODO: l10n */
priv->empty = gtk_label_new ("No new messages");
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->empty, FALSE, FALSE, 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),
projects / conv-inbox / blobdiff