[gnome-calendar/wip/gbsneto/css-nodes] event-widget: port to css nodes
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar/wip/gbsneto/css-nodes] event-widget: port to css nodes
- Date: Wed, 9 Dec 2015 04:09:07 +0000 (UTC)
commit 6e3a74a56c747709ba82c8aa4019e6d93da3d441
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Dec 9 02:07:36 2015 -0200
event-widget: port to css nodes
This commit add a css name, and use the style
context's state flags as well.
src/gcal-event-widget.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/src/gcal-event-widget.c b/src/gcal-event-widget.c
index e1c728a..8e3cdf2 100644
--- a/src/gcal-event-widget.c
+++ b/src/gcal-event-widget.c
@@ -202,6 +202,8 @@ gcal_event_widget_class_init(GcalEventWidgetClass *klass)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
+
+ gtk_widget_class_set_css_name (widget_class, "event-widget");
}
static void
@@ -361,15 +363,17 @@ gcal_event_widget_get_preferred_width (GtkWidget *widget,
gint *natural)
{
GtkBorder border, padding;
+ GtkStyleContext *context;
PangoLayout *layout;
gint layout_width;
+ context = gtk_widget_get_style_context (widget);
layout = gtk_widget_create_pango_layout (widget, "00:00:00 00:00");
pango_layout_get_pixel_size (layout, &layout_width, NULL);
g_object_unref (layout);
- gtk_style_context_get_border (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags (widget),
&border);
- gtk_style_context_get_padding (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags (widget),
&padding);
+ gtk_style_context_get_border (context, gtk_style_context_get_state (context), &border);
+ gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
if (minimum != NULL)
*minimum = layout_width + padding.left + padding.right + border.left + border.right;
@@ -383,15 +387,17 @@ gcal_event_widget_get_preferred_height (GtkWidget *widget,
gint *natural)
{
GtkBorder border, padding;
+ GtkStyleContext *context;
PangoLayout *layout;
gint layout_height;
+ context = gtk_widget_get_style_context (widget);
layout = gtk_widget_create_pango_layout (widget, NULL);
pango_layout_get_pixel_size (layout, NULL, &layout_height);
g_object_unref (layout);
- gtk_style_context_get_border (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags (widget),
&border);
- gtk_style_context_get_padding (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags (widget),
&padding);
+ gtk_style_context_get_border (context, gtk_style_context_get_state (context), &border);
+ gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
if (minimum != NULL)
*minimum = layout_height + padding.top + padding.bottom + border.top + border.bottom;
@@ -525,7 +531,7 @@ gcal_event_widget_draw (GtkWidget *widget,
priv = gcal_event_widget_get_instance_private (GCAL_EVENT_WIDGET (widget));
context = gtk_widget_get_style_context (widget);
- state = gtk_widget_get_state_flags (widget);
+ state = gtk_style_context_get_state (context);
gtk_style_context_get_padding (context, state, &padding);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]