[gtk+/wip/baedert/box: 5/14] texttag: Remove GdkColor properties
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/box: 5/14] texttag: Remove GdkColor properties
- Date: Thu, 20 Oct 2016 15:54:54 +0000 (UTC)
commit b1ce3118c207b809898cc2325f68ff26422c7a81
Author: Timm Bäder <mail baedert org>
Date: Mon Oct 17 18:44:27 2016 +0200
texttag: Remove GdkColor properties
gtk/gtktexttag.c | 91 ------------------------------------------------------
1 files changed, 0 insertions(+), 91 deletions(-)
---
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 4918cea..fabaecf 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -96,8 +96,6 @@ enum {
/* Style args */
PROP_BACKGROUND,
PROP_FOREGROUND,
- PROP_BACKGROUND_GDK,
- PROP_FOREGROUND_GDK,
PROP_BACKGROUND_RGBA,
PROP_FOREGROUND_RGBA,
PROP_FONT,
@@ -130,7 +128,6 @@ enum {
PROP_TABS,
PROP_INVISIBLE,
PROP_PARAGRAPH_BACKGROUND,
- PROP_PARAGRAPH_BACKGROUND_GDK,
PROP_PARAGRAPH_BACKGROUND_RGBA,
PROP_FALLBACK,
PROP_LETTER_SPACING,
@@ -894,16 +891,6 @@ copy_rgba_to_gdk_color (GdkRGBA *src,
}
static void
-copy_gdk_color_to_rgba (GdkColor *src,
- GdkRGBA *dest)
-{
- dest->red = src->red / 65535.;
- dest->green = src->green / 65535.;
- dest->blue = src->blue / 65535.;
- dest->alpha = 1;
-}
-
-static void
set_underline_rgba (GtkTextTag *tag,
const GdkRGBA *rgba)
{
@@ -1070,49 +1057,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
}
}
-
-static void
-set_bg_color (GtkTextTag *tag, GdkColor *color)
-{
- if (color)
- {
- GdkRGBA rgba;
-
- copy_gdk_color_to_rgba (color, &rgba);
- set_bg_rgba (tag, &rgba);
- }
- else
- set_bg_rgba (tag, NULL);
-}
-
-static void
-set_fg_color (GtkTextTag *tag, GdkColor *color)
-{
- if (color)
- {
- GdkRGBA rgba;
-
- copy_gdk_color_to_rgba (color, &rgba);
- set_fg_rgba (tag, &rgba);
- }
- else
- set_fg_rgba (tag, NULL);
-}
-
-static void
-set_pg_bg_color (GtkTextTag *tag, GdkColor *color)
-{
- if (color)
- {
- GdkRGBA rgba;
-
- copy_gdk_color_to_rgba (color, &rgba);
- set_pg_bg_rgba (tag, &rgba);
- }
- else
- set_pg_bg_rgba (tag, NULL);
-}
-
static PangoFontMask
get_property_font_set_mask (guint prop_id)
{
@@ -1317,22 +1261,6 @@ gtk_text_tag_set_property (GObject *object,
}
break;
- case PROP_BACKGROUND_GDK:
- {
- GdkColor *color = g_value_get_boxed (value);
-
- set_bg_color (text_tag, color);
- }
- break;
-
- case PROP_FOREGROUND_GDK:
- {
- GdkColor *color = g_value_get_boxed (value);
-
- set_fg_color (text_tag, color);
- }
- break;
-
case PROP_BACKGROUND_RGBA:
{
GdkRGBA *color = g_value_get_boxed (value);
@@ -1589,14 +1517,6 @@ gtk_text_tag_set_property (GObject *object,
}
break;
- case PROP_PARAGRAPH_BACKGROUND_GDK:
- {
- GdkColor *color = g_value_get_boxed (value);
-
- set_pg_bg_color (text_tag, color);
- }
- break;
-
case PROP_PARAGRAPH_BACKGROUND_RGBA:
{
GdkRGBA *color = g_value_get_boxed (value);
@@ -1797,18 +1717,10 @@ gtk_text_tag_get_property (GObject *object,
g_value_set_string (value, priv->name);
break;
- case PROP_BACKGROUND_GDK:
- g_value_set_boxed (value, &priv->values->appearance.bg_color);
- break;
-
case PROP_BACKGROUND_RGBA:
g_value_set_boxed (value, priv->values->appearance.rgba[0]);
break;
- case PROP_FOREGROUND_GDK:
- g_value_set_boxed (value, &priv->values->appearance.fg_color);
- break;
-
case PROP_FOREGROUND_RGBA:
g_value_set_boxed (value, priv->values->appearance.rgba[1]);
break;
@@ -1962,9 +1874,6 @@ gtk_text_tag_get_property (GObject *object,
g_value_set_boolean (value, priv->values->invisible);
break;
- case PROP_PARAGRAPH_BACKGROUND_GDK:
- g_value_set_boxed (value, priv->values->pg_bg_color);
- break;
case PROP_PARAGRAPH_BACKGROUND_RGBA:
g_value_set_boxed (value, priv->values->pg_bg_rgba);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]