AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

magnifier: Use new snapshot transforms

Browse Source
This commit is contained in:
Benjamin Otte 2019-02-21 05:34:12 +01:00
parent 65174c7989
commit b96e835d9e
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkmagnifier.c
View File

@ -103,7 +103,6 @@ gtk_magnifier_snapshot (GtkWidget *widget,
{ {
GtkMagnifier *magnifier = GTK_MAGNIFIER (widget); GtkMagnifier *magnifier = GTK_MAGNIFIER (widget);
GtkMagnifierPrivate *priv = gtk_magnifier_get_instance_private (magnifier); GtkMagnifierPrivate *priv = gtk_magnifier_get_instance_private (magnifier);
graphene_matrix_t transform;
double width, height, paintable_width, paintable_height; double width, height, paintable_width, paintable_height;
if (gtk_widget_paintable_get_widget (GTK_WIDGET_PAINTABLE (priv->paintable)) == NULL) if (gtk_widget_paintable_get_widget (GTK_WIDGET_PAINTABLE (priv->paintable)) == NULL)
@ -116,19 +115,16 @@ gtk_magnifier_snapshot (GtkWidget *widget,
if (paintable_width <= 0.0 || paintable_height <= 0.0) if (paintable_width <= 0.0 || paintable_height <= 0.0)
return; return;
graphene_matrix_init_translate (&transform, &GRAPHENE_POINT3D_INIT ( gtk_snapshot_save (snapshot);
- CLAMP (priv->x, 0, paintable_width),
- CLAMP (priv->y, 0, paintable_height),
0
));
graphene_matrix_scale (&transform, priv->magnification, priv->magnification, 1);
if (!priv->resize) if (!priv->resize)
graphene_matrix_translate (&transform, &GRAPHENE_POINT3D_INIT (width / 2, height / 2, 0)); gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (width / 2, height / 2));
gtk_snapshot_scale (snapshot, priv->magnification, priv->magnification);
gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (
- CLAMP (priv->x, 0, paintable_width),
- CLAMP (priv->y, 0, paintable_height)));
gtk_snapshot_push_transform (snapshot, &transform);
gdk_paintable_snapshot (priv->paintable, snapshot, paintable_width, paintable_height); gdk_paintable_snapshot (priv->paintable, snapshot, paintable_width, paintable_height);
gtk_snapshot_pop (snapshot); gtk_snapshot_restore (snapshot);
} }
static void static void