[gnome-shell/gbsneto/graphene: 2/4] Replace ClutterVertex by graphene_point3d_t
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gbsneto/graphene: 2/4] Replace ClutterVertex by graphene_point3d_t
- Date: Tue, 26 Feb 2019 13:30:11 +0000 (UTC)
commit 7d55007e9dba8bfc970370ca0001eda0b9156d29
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Feb 20 10:01:07 2019 -0300
Replace ClutterVertex by graphene_point3d_t
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/421
js/ui/iconGrid.js | 4 ++--
src/shell-util.c | 2 +-
src/st/st-box-layout.c | 2 +-
src/st/st-scroll-view-fade.c | 2 +-
src/st/st-widget.c | 8 ++++----
5 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 789a834f9..d954ec592 100644
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -1,6 +1,6 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-const { Clutter, GObject, Meta, St } = imports.gi;
+const { Clutter, GObject, Graphene, Meta, St } = imports.gi;
const Params = imports.misc.params;
const Tweener = imports.ui.tweener;
@@ -365,7 +365,7 @@ var IconGrid = GObject.registerClass({
let allocationBox = this.get_allocation_box();
let paintBox = themeNode.get_paint_box(allocationBox);
- let origin = new Clutter.Vertex();
+ let origin = new Graphene.Point3D();
origin.x = paintBox.x1 - allocationBox.x1;
origin.y = paintBox.y1 - allocationBox.y1;
origin.z = 0.0;
diff --git a/src/shell-util.c b/src/shell-util.c
index 95d9f8e14..f8dc8e538 100644
--- a/src/shell-util.c
+++ b/src/shell-util.c
@@ -89,7 +89,7 @@ shell_util_get_transformed_allocation (ClutterActor *actor,
/* Code adapted from clutter-actor.c:
* Copyright 2006, 2007, 2008 OpenedHand Ltd
*/
- ClutterVertex v[4];
+ graphene_point3d_t v[4];
gfloat x_min, x_max, y_min, y_max;
guint i;
diff --git a/src/st/st-box-layout.c b/src/st/st-box-layout.c
index 1b7127e69..c7ddbdc4e 100644
--- a/src/st/st-box-layout.c
+++ b/src/st/st-box-layout.c
@@ -506,7 +506,7 @@ st_box_layout_get_paint_volume (ClutterActor *actor,
StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (actor));
ClutterActorBox allocation_box;
ClutterActorBox content_box;
- ClutterVertex origin;
+ graphene_point3d_t origin;
/* Setting the paint volume does not make sense when we don't have any allocation */
if (!clutter_actor_has_allocation (actor))
diff --git a/src/st/st-scroll-view-fade.c b/src/st/st-scroll-view-fade.c
index 37f44c42c..1059aaab2 100644
--- a/src/st/st-scroll-view-fade.c
+++ b/src/st/st-scroll-view-fade.c
@@ -95,7 +95,7 @@ st_scroll_view_fade_paint_target (ClutterOffscreenEffect *effect)
float fade_area_topleft[2];
float fade_area_bottomright[2];
- ClutterVertex verts[4];
+ graphene_point3d_t verts[4];
clutter_actor_get_paint_box (self->actor, &paint_box);
clutter_actor_get_abs_allocation_vertices (self->actor, verts);
diff --git a/src/st/st-widget.c b/src/st/st-widget.c
index d12dbb3e2..3560f7400 100644
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -745,7 +745,7 @@ st_widget_get_paint_volume (ClutterActor *self,
ClutterActorBox paint_box, alloc_box;
StThemeNode *theme_node;
StWidgetPrivate *priv;
- ClutterVertex origin;
+ graphene_point3d_t origin;
/* Setting the paint volume does not make sense when we don't have any allocation */
if (!clutter_actor_has_allocation (self))
@@ -1850,7 +1850,7 @@ filter_by_position (GList *children,
StDirectionType direction)
{
ClutterActorBox cbox;
- ClutterVertex abs_vertices[4];
+ graphene_point3d_t abs_vertices[4];
GList *l, *ret;
ClutterActor *child;
@@ -1916,7 +1916,7 @@ get_distance (ClutterActor *actor,
{
int ax, ay, bx, by, dx, dy;
ClutterActorBox abox;
- ClutterVertex abs_vertices[4];
+ graphene_point3d_t abs_vertices[4];
clutter_actor_get_abs_allocation_vertices (actor, abs_vertices);
clutter_actor_box_from_vertices (&abox, abs_vertices);
@@ -2020,7 +2020,7 @@ st_widget_real_navigate_focus (StWidget *widget,
else /* direction is an arrow key, not tab */
{
ClutterActorBox sort_box;
- ClutterVertex abs_vertices[4];
+ graphene_point3d_t abs_vertices[4];
/* Compute the allocation box of the previous focused actor. If there
* was no previous focus, use the coordinates of the appropriate edge of
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]