[gtk/wip/otte/paintable: 3/8] Revert "cssimage: Make builtin images rotate"
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/paintable: 3/8] Revert "cssimage: Make builtin images rotate"
- Date: Sat, 17 Feb 2018 23:46:05 +0000 (UTC)
commit 066ab84851bbf71d3b4a84938b0fcdae4bfe837b
Author: Benjamin Otte <otte redhat com>
Date: Sat Feb 17 16:46:46 2018 +0100
Revert "cssimage: Make builtin images rotate"
This reverts commit bb3edb14926a0fc8e4dbde993db2de46cabb23a1.
gtk/gtkcssimagebuiltin.c | 35 +----------------------------------
gtk/gtkcssimagebuiltinprivate.h | 1 -
2 files changed, 1 insertion(+), 35 deletions(-)
---
diff --git a/gtk/gtkcssimagebuiltin.c b/gtk/gtkcssimagebuiltin.c
index ff586d6f6b..aedc2e8ff5 100644
--- a/gtk/gtkcssimagebuiltin.c
+++ b/gtk/gtkcssimagebuiltin.c
@@ -498,30 +498,7 @@ gtk_css_image_builtin_equal (GtkCssImage *image1,
GtkCssImageBuiltin *builtin2 = GTK_CSS_IMAGE_BUILTIN (image2);
return gdk_rgba_equal (&builtin1->fg_color, &builtin2->fg_color)
- && gdk_rgba_equal (&builtin1->bg_color, &builtin2->bg_color)
- && builtin1->rotation == builtin2->rotation;
-}
-
-static gboolean
-gtk_css_image_builtin_is_dynamic (GtkCssImage *image)
-{
- return TRUE;
-}
-
-static GtkCssImage *
-gtk_css_image_builtin_get_dynamic_image (GtkCssImage *image,
- gint64 monotonic_time)
-{
- GtkCssImageBuiltin *builtin = GTK_CSS_IMAGE_BUILTIN (image);
- GtkCssImageBuiltin *result;
-
- result = g_object_new (GTK_TYPE_CSS_IMAGE_BUILTIN, NULL);
-
- result->fg_color = builtin->fg_color;
- result->bg_color = builtin->bg_color;
- result->rotation = 2 * G_PI * (monotonic_time % G_USEC_PER_SEC) / G_USEC_PER_SEC;
-
- return GTK_CSS_IMAGE (result);
+ && gdk_rgba_equal (&builtin1->bg_color, &builtin2->bg_color);
}
static void
@@ -544,8 +521,6 @@ gtk_css_image_builtin_class_init (GtkCssImageBuiltinClass *klass)
image_class->print = gtk_css_image_builtin_print;
image_class->compute = gtk_css_image_builtin_compute;
image_class->equal = gtk_css_image_builtin_equal;
- image_class->is_dynamic = gtk_css_image_builtin_is_dynamic;
- image_class->get_dynamic_image = gtk_css_image_builtin_get_dynamic_image;
object_class->dispose = gtk_css_image_builtin_dispose;
}
@@ -583,14 +558,6 @@ gtk_css_image_builtin_draw (GtkCssImage *image,
return;
}
- {
- GtkCssImageBuiltin *builtin = GTK_CSS_IMAGE_BUILTIN (image);
-
- cairo_translate (cr, width / 2.0, height / 2.0);
- cairo_rotate (cr, builtin->rotation);
- cairo_translate (cr, - width / 2.0, - height / 2.0);
- }
-
switch (image_type)
{
default:
diff --git a/gtk/gtkcssimagebuiltinprivate.h b/gtk/gtkcssimagebuiltinprivate.h
index 053db04b6b..66c94d2f0a 100644
--- a/gtk/gtkcssimagebuiltinprivate.h
+++ b/gtk/gtkcssimagebuiltinprivate.h
@@ -41,7 +41,6 @@ struct _GtkCssImageBuiltin
GdkRGBA fg_color;
GdkRGBA bg_color;
- double rotation;
};
struct _GtkCssImageBuiltinClass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]