[Xfce4-commits] [apps/xfdashboard] 01/01: Add property 'padding' to XfdashboardEmblemEffect

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

nomad pushed a commit to branch master
in repository apps/xfdashboard.

commit 646724c63fbf6520fb874eaac99bc0d0a5f3c603
Author: Stephan Haller <nomad at froevel.de>
Date:   Wed Apr 22 21:27:42 2015 +0200

    Add property 'padding' to XfdashboardEmblemEffect
    
    This property adds padding to the emblem. Technically a margin at the actor is logically added and reduces the space of the actor at the border by the value of padding. Another explaination is that this property adds an additional offset (next to the alignment) to the emblem position.
---
 xfdashboard/emblem-effect.c |   69 +++++++++++++++++++++++++++++++++++++++++--
 xfdashboard/emblem-effect.h |    3 ++
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/xfdashboard/emblem-effect.c b/xfdashboard/emblem-effect.c
index 8ffb626..4dfd10b 100644
--- a/xfdashboard/emblem-effect.c
+++ b/xfdashboard/emblem-effect.c
@@ -51,6 +51,7 @@ struct _XfdashboardEmblemEffectPrivate
 	/* Properties related */
 	gchar						*iconName;
 	gint						iconSize;
+	gfloat						padding;
 	gfloat						xAlign;
 	gfloat						yAlign;
 	XfdashboardAnchorPoint		anchorPoint;
@@ -70,6 +71,7 @@ enum
 
 	PROP_ICON_NAME,
 	PROP_ICON_SIZE,
+	PROP_PADDING,
 	PROP_X_ALIGN,
 	PROP_Y_ALIGN,
 	PROP_ANCHOR_POINT,
@@ -180,8 +182,23 @@ static void _xfdashboard_emblem_effect_paint(ClutterEffect *inEffect, ClutterEff
 			}
 	}
 
-	/* Get actor size */
+	/* Get actor size and apply padding. If actor width or height will drop
+	 * to zero or below then the emblem could not be drawn and we return here.
+	 */
 	clutter_actor_get_content_box(target, &actorBox);
+	actorBox.x1+=priv->padding;
+	actorBox.x2-=priv->padding;
+	actorBox.y1+=priv->padding;
+	actorBox.y2-=priv->padding;
+
+	if(actorBox.x2<=actorBox.x1 ||
+		actorBox.y2<=actorBox.y1)
+	{
+		g_debug("Will not draw emblem '%s' because width or height of actor is zero or below after padding was applied.",
+				priv->iconName);
+		return;
+	}
+
 	actorWidth=actorBox.x2-actorBox.x1;
 	actorHeight=actorBox.y2-actorBox.y1;
 
@@ -367,6 +384,10 @@ static void _xfdashboard_emblem_effect_set_property(GObject *inObject,
 			xfdashboard_emblem_effect_set_icon_size(self, g_value_get_int(inValue));
 			break;
 
+		case PROP_PADDING:
+			xfdashboard_emblem_effect_set_padding(self, g_value_get_float(inValue));
+			break;
+
 		case PROP_X_ALIGN:
 			xfdashboard_emblem_effect_set_x_align(self, g_value_get_float(inValue));
 			break;
@@ -403,6 +424,10 @@ static void _xfdashboard_emblem_effect_get_property(GObject *inObject,
 			g_value_set_int(outValue, priv->iconSize);
 			break;
 
+		case PROP_PADDING:
+			g_value_set_float(outValue, priv->padding);
+			break;
+
 		case PROP_X_ALIGN:
 			g_value_set_float(outValue, priv->xAlign);
 			break;
@@ -456,6 +481,14 @@ static void xfdashboard_emblem_effect_class_init(XfdashboardEmblemEffectClass *k
 							16,
 							G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
+	XfdashboardEmblemEffectProperties[PROP_PADDING]=
+		g_param_spec_float("padding",
+							_("Padding"),
+							_("Padding around emblem"),
+							0.0f, G_MAXFLOAT,
+							0.0f,
+							G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
 	XfdashboardEmblemEffectProperties[PROP_X_ALIGN]=
 		g_param_spec_float("x-align",
 							_("X align"),
@@ -494,7 +527,8 @@ static void xfdashboard_emblem_effect_init(XfdashboardEmblemEffect *self)
 
 	/* Set up default values */
 	priv->iconName=NULL;
-	priv->iconSize=16.0f;
+	priv->iconSize=16;
+	priv->padding=0.0f;
 	priv->xAlign=0.0f;
 	priv->yAlign=0.0f;
 	priv->anchorPoint=XFDASHBOARD_ANCHOR_POINT_NONE;
@@ -606,6 +640,37 @@ void xfdashboard_emblem_effect_set_icon_size(XfdashboardEmblemEffect *self, cons
 }
 
 /* Get/set x align of emblem */
+gfloat xfdashboard_emblem_effect_get_padding(XfdashboardEmblemEffect *self)
+{
+	g_return_val_if_fail(XFDASHBOARD_IS_EMBLEM_EFFECT(self), 0.0f);
+
+	return(self->priv->padding);
+}
+
+void xfdashboard_emblem_effect_set_padding(XfdashboardEmblemEffect *self, const gfloat inPadding)
+{
+	XfdashboardEmblemEffectPrivate		*priv;
+
+	g_return_if_fail(XFDASHBOARD_IS_EMBLEM_EFFECT(self));
+	g_return_if_fail(inPadding>=0.0f);
+
+	priv=self->priv;
+
+	/* Set value if changed */
+	if(priv->padding!=inPadding)
+	{
+		/* Set value */
+		priv->padding=inPadding;
+
+		/* Invalidate effect to get it redrawn */
+		clutter_effect_queue_repaint(CLUTTER_EFFECT(self));
+
+		/* Notify about property change */
+		g_object_notify_by_pspec(G_OBJECT(self), XfdashboardEmblemEffectProperties[PROP_PADDING]);
+	}
+}
+
+/* Get/set x align of emblem */
 gfloat xfdashboard_emblem_effect_get_x_align(XfdashboardEmblemEffect *self)
 {
 	g_return_val_if_fail(XFDASHBOARD_IS_EMBLEM_EFFECT(self), 0.0f);
diff --git a/xfdashboard/emblem-effect.h b/xfdashboard/emblem-effect.h
index 3ffd05e..6367395 100644
--- a/xfdashboard/emblem-effect.h
+++ b/xfdashboard/emblem-effect.h
@@ -68,6 +68,9 @@ void xfdashboard_emblem_effect_set_icon_name(XfdashboardEmblemEffect *self, cons
 gint xfdashboard_emblem_effect_get_icon_size(XfdashboardEmblemEffect *self);
 void xfdashboard_emblem_effect_set_icon_size(XfdashboardEmblemEffect *self, const gint inSize);
 
+gfloat xfdashboard_emblem_effect_get_padding(XfdashboardEmblemEffect *self);
+void xfdashboard_emblem_effect_set_padding(XfdashboardEmblemEffect *self, const gfloat inPadding);
+
 gfloat xfdashboard_emblem_effect_get_x_align(XfdashboardEmblemEffect *self);
 void xfdashboard_emblem_effect_set_x_align(XfdashboardEmblemEffect *self, const gfloat inAlign);
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.