[gtk/matthiasc/glshader-node: 17/18] gtk-demo: Simplify transitions demo
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/glshader-node: 17/18] gtk-demo: Simplify transitions demo
- Date: Mon, 28 Sep 2020 16:52:33 +0000 (UTC)
commit 4906779f72ee9baf0a2fd7b0585730e95b3bbfe5
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Sep 28 12:45:31 2020 -0400
gtk-demo: Simplify transitions demo
We are not using the frame clock anymore, so don't
pass it around.
demos/gtk-demo/gltransition.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/demos/gtk-demo/gltransition.c b/demos/gtk-demo/gltransition.c
index b66da253f3..24b6f96f30 100644
--- a/demos/gtk-demo/gltransition.c
+++ b/demos/gtk-demo/gltransition.c
@@ -129,10 +129,9 @@ update_paintable (GtkWidget *widget,
}
static GtkWidget *
-make_shader_stack (const char *name,
- const char *resource_path,
- GtkWidget *scale,
- GdkFrameClock *frame_clock)
+make_shader_stack (const char *name,
+ const char *resource_path,
+ GtkWidget *scale)
{
GtkWidget *stack, *child, *widget, *vbox, *hbox, *bin;
GtkWidget *label, *button, *tv;
@@ -272,7 +271,6 @@ static GtkWidget *
create_gltransition_window (GtkWidget *do_widget)
{
GtkWidget *window, *headerbar, *scale, *grid;
- GdkFrameClock *frame_clock;
window = gtk_window_new ();
gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
@@ -300,20 +298,17 @@ create_gltransition_window (GtkWidget *do_widget)
gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
- gtk_widget_realize (window);
- frame_clock = gtk_widget_get_frame_clock (window);
-
gtk_grid_attach (GTK_GRID (grid),
- make_shader_stack ("Wind", "/gltransition/transition1.glsl", scale, frame_clock),
+ make_shader_stack ("Wind", "/gltransition/transition1.glsl", scale),
0, 0, 1, 1);
gtk_grid_attach (GTK_GRID (grid),
- make_shader_stack ("Radial", "/gltransition/transition2.glsl", scale, frame_clock),
+ make_shader_stack ("Radial", "/gltransition/transition2.glsl", scale),
1, 0, 1, 1);
gtk_grid_attach (GTK_GRID (grid),
- make_shader_stack ("Crosswarp", "/gltransition/transition3.glsl", scale, frame_clock),
+ make_shader_stack ("Crosswarp", "/gltransition/transition3.glsl", scale),
0, 1, 1, 1);
gtk_grid_attach (GTK_GRID (grid),
- make_shader_stack ("Kaleidoscope", "/gltransition/transition4.glsl", scale, frame_clock),
+ make_shader_stack ("Kaleidoscope", "/gltransition/transition4.glsl", scale),
1, 1, 1, 1);
return window;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]