luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Forgotten commit

Browse Source 
svn path=/trunk/; revision=7300
This commit is contained in:
Matthias Clasen
2008-08-04 17:19:30 +00:00
parent 1a9db68e53
commit 001bb527b6
12 changed files with 513 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
gio/gemblemedicon.c
View File

@@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*
* Author: Matthias Clasen <mclasen@redhat.com>
* Clemens N. Buss <cebuzz@gmail.com>
*/
#include <config.h>
@@ -35,14 +36,14 @@
* SECTION:gemblemedicon
* @short_description: Icon with emblems
* @include: gio/gio.h
* @see_also: #GIcon, #GLoadableIcon, #GThemedIcon
* @see_also: #GIcon, #GLoadableIcon, #GThemedIcon, #GEmblem
*
* #GEmblemedIcon is an implementation of #GIcon that supports
* adding an emblem to an icon. To add multiple emblems to an
* icon, you can create nested #GemblemedIcon<!-- -->s.
* adding an emblem to an icon. Adding multiple emblems to an
* icon is ensured via g_emblemed_icon_add_emblem().
*
* Note that #GEmblemedIcon allows no control over the position
* of the emblems. It is up to the rendering code to pick a position.
* of the emblems. See also #GEmblem for more information.
**/
static void g_emblemed_icon_icon_iface_init (GIconIface *iface);
@@ -52,7 +53,7 @@ struct _GEmblemedIcon
GObject parent_instance;
GIcon *icon;
GIcon *emblem;
GList *emblems;
};
struct _GEmblemedIconClass
@@ -61,8 +62,8 @@ struct _GEmblemedIconClass
};
G_DEFINE_TYPE_WITH_CODE (GEmblemedIcon, g_emblemed_icon, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_ICON,
g_emblemed_icon_icon_iface_init))
G_IMPLEMENT_INTERFACE (G_TYPE_ICON,
g_emblemed_icon_icon_iface_init))
static void
@@ -73,7 +74,7 @@ g_emblemed_icon_finalize (GObject *object)
emblemed = G_EMBLEMED_ICON (object);
g_object_unref (emblemed->icon);
g_object_unref (emblemed->emblem);
g_list_foreach (emblemed->emblems, (GFunc) g_object_unref, NULL);
(*G_OBJECT_CLASS (g_emblemed_icon_parent_class)->finalize) (object);
}
@@ -92,88 +93,150 @@ g_emblemed_icon_init (GEmblemedIcon *emblemed)
/**
* g_emblemed_icon_new:
* @icon: a #GIcon.
* @emblem: a #GIcon
* @icon: a #GIcon
* @emblem: a #GEmblem
*
* Creates a new emblemed icon for @icon with emblem @emblem.
* Creates a new emblemed icon for @icon with the emblem @emblem.
*
* Returns: a new #GEmblemedIcon.
* Returns: a new #GIcon
*
* Since: 2.18
**/
GIcon *
g_emblemed_icon_new (GIcon *icon,
GIcon *emblem)
g_emblemed_icon_new (GIcon *icon,
GEmblem *emblem)
{
GEmblemedIcon *emblemed;
g_return_val_if_fail (icon != NULL, NULL);
g_return_val_if_fail (emblem != NULL, NULL);
g_return_val_if_fail (G_IS_ICON (icon), NULL);
g_return_val_if_fail (!G_IS_EMBLEM (icon), NULL);
g_return_val_if_fail (G_IS_EMBLEM (emblem), NULL);
emblemed = G_EMBLEMED_ICON (g_object_new (G_TYPE_EMBLEMED_ICON, NULL));
emblemed->icon = g_object_ref (icon);
emblemed->emblem = g_object_ref (emblem);
g_emblemed_icon_add_emblem (emblemed, emblem);
return G_ICON (emblemed);
}
/**
* g_emblemed_icon_get_icon:
* @icon: a #GEmblemedIcon.
* @emblemed: a #GEmblemedIcon
*
* Gets the main icon for @icon.
* Gets the main icon for @emblemed.
*
* Returns: a #GIcon that is owend by @icon
* Returns: a #GIcon that is owned by @emblemed
*
* Since: 2.18
**/
GIcon *
g_emblemed_icon_get_icon (GEmblemedIcon *icon)
g_emblemed_icon_get_icon (GEmblemedIcon *emblemed)
{
g_return_val_if_fail (G_IS_EMBLEMED_ICON (icon), NULL);
g_return_val_if_fail (G_IS_EMBLEMED_ICON (emblemed), NULL);
return icon->icon;
return emblemed->icon;
}
/**
* g_emblemed_icon_get_emblem:
* @icon: a #GEmblemedIcon.
* g_emblemed_icon_get_emblems:
* @emblemed: a #GEmblemedIcon
*
* Gets the emblem for @icon.
* Gets the list of emblems for the @icon.
*
* Returns: a #GIcon that is owned by @icon
* Returns: a #GList of #GEmblem <!-- -->s that is owned by @emblemed
*
* Since: 2.18
**/
GIcon *
g_emblemed_icon_get_emblem (GEmblemedIcon *icon)
{
g_return_val_if_fail (G_IS_EMBLEMED_ICON (icon), NULL);
return icon->emblem;
GList *
g_emblemed_icon_get_emblems (GEmblemedIcon *emblemed)
{
g_return_val_if_fail (G_IS_EMBLEMED_ICON (emblemed), NULL);
return emblemed->emblems;
}
/**
* g_emblemed_icon_add_emblem:
* @emblemed: a #GEmblemedIcon
* @emblem: a #GEmblem
*
* Adds @emblem to the #GList of #GEmblem <!-- -->s.
*
* Returns: a #GList of #GEmblem <!-- -->s that is owned by @emblemed
*
* Since: 2.18
**/
void
g_emblemed_icon_add_emblem (GEmblemedIcon *emblemed,
GEmblem *emblem)
{
g_return_if_fail (G_IS_EMBLEMED_ICON (emblemed));
g_return_if_fail (G_IS_EMBLEM (emblem));
g_object_ref (emblem);
emblemed->emblems = g_list_append (emblemed->emblems, emblem);
}
static guint
g_emblemed_icon_hash (GIcon *icon)
{
GEmblemedIcon *emblemed = G_EMBLEMED_ICON (icon);
guint hash;
GList *list;
guint hash = g_icon_hash (emblemed->icon);
hash = g_icon_hash (emblemed->icon);
hash ^= g_icon_hash (emblemed->emblem);
for (list = emblemed->emblems; list != NULL; list = list->next)
hash ^= g_icon_hash (G_ICON (list->data));
return hash;
}
static gint
g_emblem_comp (GEmblem *a,
GEmblem *b)
{
guint hash_a = g_icon_hash (G_ICON (a));
guint hash_b = g_icon_hash (G_ICON (b));
if(hash_a < hash_b)
return -1;
if(hash_a == hash_b)
return 0;
return 1;
}
static gboolean
g_emblemed_icon_equal (GIcon *icon1,
GIcon *icon2)
{
GEmblemedIcon *emblemed1 = G_EMBLEMED_ICON (icon1);
GEmblemedIcon *emblemed2 = G_EMBLEMED_ICON (icon2);
GList *list1, *list2;
return g_icon_equal (emblemed1->icon, emblemed2->icon) &&
g_icon_equal (emblemed1->emblem, emblemed2->emblem);
if (!g_icon_equal (emblemed1->icon, emblemed2->icon))
return FALSE;
list1 = emblemed1->emblems;
list2 = emblemed2->emblems;
list1 = g_list_sort (list1, (GCompareFunc) g_emblem_comp);
list2 = g_list_sort (list2, (GCompareFunc) g_emblem_comp);
while (list1 && list2)
{
if (!g_icon_equal (G_ICON (list1->data), G_ICON (list2->data)))
return FALSE;
list1 = list1->next;
list2 = list2->next;
}
return list1 == NULL && list2 == NULL;
}
static void