[gtk/css-line-decoration] Clean up the code
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/css-line-decoration] Clean up the code
- Date: Fri, 27 Aug 2021 00:45:46 +0000 (UTC)
commit 3a50ff57d8db6b04a7552e20fce00ab24aa4d8d5
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Aug 26 20:45:17 2021 -0400
Clean up the code
Avoid compiler warnings, and make the code
a bit more compact.
gtk/gtktextview.c | 60 ++++++++++++++-----------------------------------------
1 file changed, 15 insertions(+), 45 deletions(-)
---
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 38126a27b8..3a66926e98 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -7637,47 +7637,6 @@ gtk_text_view_end_selection_drag (GtkTextView *text_view)
* Layout utils
*/
-static PangoUnderline
-get_pango_underline_from_style (GtkTextDecorationStyle style)
-{
- switch (style)
- {
- case GTK_CSS_TEXT_DECORATION_STYLE_DOUBLE:
- return PANGO_UNDERLINE_DOUBLE;
- case GTK_CSS_TEXT_DECORATION_STYLE_WAVY:
- return PANGO_UNDERLINE_ERROR;
- case GTK_CSS_TEXT_DECORATION_STYLE_SOLID:
- default:
- return PANGO_UNDERLINE_SINGLE;
- }
-
- g_return_val_if_reached (PANGO_UNDERLINE_SINGLE);
-}
-
-static PangoOverline
-get_pango_overline_from_style (GtkTextDecorationStyle style)
-{
- return PANGO_OVERLINE_SINGLE;
-}
-
-static PangoTextTransform
-get_pango_text_transform_from_style (GtkTextTransform transform)
-{
- switch (transform)
- {
- case GTK_CSS_TEXT_TRANSFORM_NONE:
- return PANGO_TEXT_TRANSFORM_NONE;
- case GTK_CSS_TEXT_TRANSFORM_LOWERCASE:
- return PANGO_TEXT_TRANSFORM_LOWERCASE;
- case GTK_CSS_TEXT_TRANSFORM_UPPERCASE:
- return PANGO_TEXT_TRANSFORM_UPPERCASE;
- case GTK_CSS_TEXT_TRANSFORM_CAPITALIZE:
- return PANGO_TEXT_TRANSFORM_CAPITALIZE;
- default:
- return PANGO_TEXT_TRANSFORM_NONE;
- }
-}
-
static void
gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
GtkTextAttributes *values)
@@ -7686,10 +7645,8 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
const GdkRGBA black = { 0, };
const GdkRGBA *color;
const GdkRGBA *decoration_color;
- double height;
GtkTextDecorationLine decoration_line;
GtkTextDecorationStyle decoration_style;
- GtkTextTransform transform;
if (!values->appearance.bg_rgba)
values->appearance.bg_rgba = gdk_rgba_copy (&black);
@@ -7719,7 +7676,20 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
if (decoration_line & GTK_CSS_TEXT_DECORATION_LINE_UNDERLINE)
{
- values->appearance.underline = get_pango_underline_from_style (decoration_style);
+ switch (decoration_style)
+ {
+ case GTK_CSS_TEXT_DECORATION_STYLE_DOUBLE:
+ values->appearance.underline = PANGO_UNDERLINE_DOUBLE;
+ break;
+ case GTK_CSS_TEXT_DECORATION_STYLE_WAVY:
+ values->appearance.underline = PANGO_UNDERLINE_ERROR;
+ break;
+ case GTK_CSS_TEXT_DECORATION_STYLE_SOLID:
+ default:
+ values->appearance.underline = PANGO_UNDERLINE_SINGLE;
+ break;
+ }
+
if (values->appearance.underline_rgba)
*values->appearance.underline_rgba = *decoration_color;
else
@@ -7734,7 +7704,7 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
if (decoration_line & GTK_CSS_TEXT_DECORATION_LINE_OVERLINE)
{
- values->appearance.overline = get_pango_overline_from_style (decoration_style);
+ values->appearance.overline = PANGO_OVERLINE_SINGLE;
if (values->appearance.overline_rgba)
*values->appearance.overline_rgba = *decoration_color;
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]