Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "event-widget: hardcode padding-top/bottom at 4px"

Browse Source 
This reverts commit 554ef1d80b.
This commit is contained in:
Erick Pérez Castellanos
2015-02-13 09:12:15 -05:00
parent dccaf54d5e
commit 16d77a6718
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-event-widget.c
+8 -4
View File
@@ -389,6 +389,7 @@ gcal_event_widget_get_preferred_height (GtkWidget *widget,
gint *natural) gint *natural)
{ {
GtkBorder margin; GtkBorder margin;
GtkBorder padding;
PangoLayout *layout; PangoLayout *layout;
gint height; gint height;
@@ -399,9 +400,12 @@ gcal_event_widget_get_preferred_height (GtkWidget *widget,
gtk_style_context_get_margin (gtk_widget_get_style_context (widget), gtk_style_context_get_margin (gtk_widget_get_style_context (widget),
gtk_widget_get_state_flags (widget), gtk_widget_get_state_flags (widget),
&margin); &margin);
gtk_style_context_get_padding (gtk_widget_get_style_context (widget),
gtk_widget_get_state_flags (widget),
&padding);
*minimum = *natural = *minimum = *natural =
height + 4 + 4 + margin.top + margin.bottom; height + padding.top + padding.bottom + margin.top + margin.bottom;
g_object_unref (layout); g_object_unref (layout);
} }
@@ -586,7 +590,7 @@ gcal_event_widget_draw (GtkWidget *widget,
gtk_render_layout (context, cr, gtk_render_layout (context, cr,
x + padding.left + left_gap, x + padding.left + left_gap,
y + 4, y + padding.top,
layout); layout);
/* render reminder icon */ /* render reminder icon */
@@ -612,7 +616,7 @@ gcal_event_widget_draw (GtkWidget *widget,
gdk_cairo_set_source_pixbuf (cr, gdk_cairo_set_source_pixbuf (cr,
pixbuf, pixbuf,
x + padding.left, x + padding.left,
y + 4 + ((icon_size - (16 * multiplier)) / 2)); y + padding.top + ((icon_size - (16 * multiplier)) / 2));
g_object_unref (pixbuf); g_object_unref (pixbuf);
cairo_paint (cr); cairo_paint (cr);
} }
@@ -640,7 +644,7 @@ gcal_event_widget_draw (GtkWidget *widget,
gdk_cairo_set_source_pixbuf (cr, gdk_cairo_set_source_pixbuf (cr,
pixbuf, pixbuf,
width - right_gap, width - right_gap,
y + 4 + ((icon_size - (16 * multiplier)) / 2)); y + padding.top + ((icon_size - (16 * multiplier)) / 2));
g_object_unref (pixbuf); g_object_unref (pixbuf);
cairo_paint (cr); cairo_paint (cr);
} }