EL_TYPE_HOME_APPLET, ELHomeAppletPrivate))
#define BOX_WIDTH 352
-#define BOX_HEIGHT 256
+#define BOX_HEIGHT 266
#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;
guint unread_count;
- const gchar *current_font;
+ struct {
+ float red;
+ float green;
+ float blue;
+ } active_color;
+ PangoFontDescription *font_desc;
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);
-const gchar* g_module_check_init(GModule *module);
+const gchar* g_module_check_init (GModule *module);
const gchar*
-g_module_check_init(GModule *module)
+g_module_check_init (GModule *module)
{
g_module_make_resident (module);
return NULL;
x + r, y);
}
-static void
+static gboolean
draw_text (cairo_t *cr,
+ PangoFontDescription *desc,
const gchar *text,
double x,
double y,
int width,
- int height)
+ 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);
- pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
+ 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);
+ 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);
+ 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)
+{
+ if (priv->scroll_anim_id > 0) {
+ g_source_remove (priv->scroll_anim_id);
+ priv->scroll_anim_id = 0;
+ priv->scroll_on_click = FALSE;
+ }
+}
+
+static void
+style_set_cb (GtkWidget *widget,
+ GtkStyle *previous_style,
+ ELHomeApplet *self)
+{
+ ELHomeAppletPrivate *priv = self->priv;
+ GdkColor color;
+ GtkStyle *font_style;
+
+ font_style = gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget),
+ "SystemFont",
+ NULL,
+ G_TYPE_NONE);
+ if (font_style && font_style->font_desc) {
+ if (priv->font_desc)
+ pango_font_description_free (priv->font_desc);
+ priv->font_desc = pango_font_description_copy (font_style->font_desc);
+ }
+
+ if (gtk_style_lookup_color (widget->style,
+ "ActiveTextColor",
+ &color)) {
+ priv->active_color.red = color.red/(float)G_MAXUINT16;
+ priv->active_color.green = color.green/(float)G_MAXUINT16;
+ priv->active_color.blue = color.blue/(float)G_MAXUINT16;
+ }
}
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;
- /* find theme active color */
- gtk_style_lookup_color (self->style, "ActiveTextColor", &color);
- red = color.red/(float)G_MAXUINT16;
- green = color.green/(float)G_MAXUINT16;
- blue = color.blue/(float)G_MAXUINT16;
+ message_height = C_HEIGHT - priv->received->allocation.height - HEADER_HEIGHT;
cr = gdk_cairo_create (self->window);
gdk_cairo_region (cr, event->region);
BOX_HEIGHT - 2*C_Y,
BOX_RADIOUS);
- cairo_close_path(cr);
+ cairo_close_path (cr);
cairo_stroke (cr);
/* draw header */
cairo_line_to (cr, C_WIDTH, HEADER_HEIGHT);
cairo_line_to (cr, 0, HEADER_HEIGHT);
- cairo_close_path(cr);
+ cairo_close_path (cr);
cairo_set_source_rgba (cr, 0.2f, 0.2f, 0.2f, 0.8f);
cairo_fill_preserve (cr);
- cairo_set_source_rgba (cr, red, green, blue, 1.0f);
+ cairo_set_source_rgba (cr,
+ priv->active_color.red,
+ priv->active_color.green,
+ priv->active_color.blue,
+ 1.0f);
cairo_stroke (cr);
/* draw body */
cairo_curve_to (cr, C_WIDTH, C_HEIGHT, C_WIDTH, C_HEIGHT, C_WIDTH, C_HEIGHT - BOX_RADIOUS);
cairo_line_to (cr, C_WIDTH, HEADER_HEIGHT);
cairo_line_to (cr, 0, HEADER_HEIGHT);
- cairo_close_path(cr);
+ cairo_close_path (cr);
/* 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);
+ grad = cairo_pattern_create_linear (0, HEADER_HEIGHT,
+ 0, C_HEIGHT);
+
+ if (priv->active) {
+ cairo_pattern_add_color_stop_rgba (grad,
+ 0.5f,
+ priv->active_color.red,
+ priv->active_color.green,
+ priv->active_color.blue,
+ 0.8f);
+ cairo_pattern_add_color_stop_rgba (grad,
+ 1.0f,
+ priv->active_color.red/2,
+ priv->active_color.green/2,
+ priv->active_color.blue/2,
+ 0.8f);
}
else {
cairo_pattern_add_color_stop_rgba (grad, 0.5f,
/* BOX_WIDTH - 2*C_X, */
/* BOX_HEIGHT - 2*C_Y, */
/* BOX_RADIOUS); */
- /* cairo_close_path(cr); */
+ /* cairo_close_path (cr); */
/* cairo_stroke (cr); */
/* draw message */
- draw_text (cr, priv->message,
- 2*C_X, HEADER_HEIGHT,
- MESSAGE_WIDTH,
- MESSAGE_HEIGHT - 2*C_Y);
+ gboolean ellipsized;
+ ellipsized = draw_text (cr,
+ priv->font_desc,
+ priv->message,
+ 2*C_X, HEADER_HEIGHT,
+ MESSAGE_WIDTH,
+ message_height,
+ priv->scroll_offset);
+ if (!priv->scroll_anim_id && !priv->scroll_offset)
+ 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;
- if (priv->idle_id){
+ stop_scroll_anim (priv);
+ if (priv->idle_id) {
g_source_remove (priv->idle_id);
priv->idle_id = 0;
}
- if (priv->eventlogger){
+ if (priv->eventlogger) {
g_object_unref (priv->eventlogger);
priv->eventlogger = NULL;
}
- if (priv->message){
+ if (priv->message) {
g_free (priv->message);
priv->message = NULL;
}
+ if (priv->font_desc) {
+ pango_font_description_free (priv->font_desc);
+ priv->font_desc = NULL;
+ }
G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self);
}
priv->message = NULL;
}
- if (it && rtcom_el_iter_first (it)){
+ if (it && rtcom_el_iter_first (it)) {
rtcom_el_iter_dup_string (it, "free-text", &priv->message);
- if (priv->message){
+ if (priv->message) {
const gchar *service;
time_t received_t;
if (rtcom_el_iter_get_int (it, "start-time", (gint*)&received_t))
received = format_time (received_t);
- if(!rtcom_el_iter_dup_string (it, "remote-name", &remote))
+ if (!rtcom_el_iter_dup_string (it, "remote-name", &remote))
rtcom_el_iter_dup_string (it, "remote-id", &remote);
service = rtcom_el_iter_get_service (it);
if (!g_strcmp0 (service, "RTCOM_EL_SERVICE_SMS"))
icon_name = "chat_unread_chat";
}
}
- else{
+ else {
priv->event_id = -1;
}
gtk_label_set_text (GTK_LABEL (priv->sender), remote);
gtk_label_set_text (GTK_LABEL (priv->received), received);
- if (icon_name){
+ if (icon_name) {
const gchar *current_icon_name;
gtk_image_get_icon_name (GTK_IMAGE (priv->icon),
¤t_icon_name,
g_free (remote);
+ stop_scroll_anim (self->priv);
+ priv->scroll_offset = 0;
gtk_widget_queue_draw (GTK_WIDGET (self));
}
query = rtcom_el_query_new (el);
rtcom_el_query_set_limit (query, 1);
- if (event_id >= 0){
+ if (event_id >= 0) {
rtcom_el_query_prepare (query,
"is-read", FALSE, RTCOM_EL_OP_EQUAL,
"id", event_id, RTCOM_EL_OP_EQUAL,
"event-type", event_types, RTCOM_EL_OP_IN_STRV,
NULL);
}
- else{
+ else {
rtcom_el_query_prepare (query,
"is-read", FALSE, RTCOM_EL_OP_EQUAL,
"service", services, RTCOM_EL_OP_IN_STRV,
NULL);
}
it = rtcom_el_get_events (el, query);
- g_object_unref(query);
+ g_object_unref (query);
return it;
}
ELHomeAppletPrivate *priv = self->priv;
gchar *text;
- if (priv->unread_count > 0){
+ 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);
"SELECT SUM(total_events)-SUM(read_events) FROM GroupCache;",
-1,
&stmt,
- NULL) != SQLITE_OK){
+ NULL) != SQLITE_OK) {
g_error ("%s: can't compile SQL", G_STRFUNC);
return -1;
}
while (SQLITE_BUSY == (ret = sqlite3_step (stmt)));
- if (ret == SQLITE_ROW){
+ if (ret == SQLITE_ROW) {
count = sqlite3_column_int (stmt, 0);
}
- else{
+ else {
g_error ("%s: error while executing SQL", G_STRFUNC);
}
{
ELHomeAppletPrivate *priv = self->priv;
- if (priv->event_id >= 0){
+ if (priv->event_id >= 0) {
rtcom_el_set_read_event (priv->eventlogger,
priv->event_id,
TRUE,
}
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 (GTK_WIDGET (self));
return TRUE;
}
{
ELHomeAppletPrivate *priv = self->priv;
- if (priv->event_id > 0){
+ if (priv->event_id > 0) {
priv->active = TRUE;
gtk_widget_queue_draw (widget);
}
}
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);
+ if (priv->scroll_on_click) {
+ priv->scroll_on_click = FALSE;
+ priv->scroll_anim_id = g_timeout_add (100,
+ (GSourceFunc)scroll_anim_cb,
+ self);
+ }
+ else
+#ifndef DEBUG_LAYOUT
+ mark_as_read (self);
+#endif
+ gtk_widget_queue_draw (widget);
+ }
+
+ return TRUE;
+}
+
+static gboolean
leave_notify_event_cb (GtkWidget *widget,
GdkEventCrossing *event,
ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
- if (priv->active){
+ 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_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");
+ priv->message = g_strdup ("One two three four five six seven eight nine ten");
/* TODO: l10n */
priv->empty = gtk_label_new ("No new messages");
g_signal_connect (event_box, "leave-notify-event",
G_CALLBACK (leave_notify_event_cb), self);
+ g_signal_connect (event_box, "style-set", G_CALLBACK (style_set_cb), self);
+
gtk_widget_show_all (GTK_WIDGET (event_box));
#ifndef DEBUG_LAYOUT
projects / conv-inbox / blobdiff