brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "st: Only use clutter_actor_invalidate_paint_volume() if the API exists"

Browse Source 
Since we are past the 40 API change hurdle, it is safe to revert this
commit.

This reverts commit 1cefd589da.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2010>
(cherry picked from commit ff4ff66498)
This commit is contained in:
Carlos Garnacho 2021-10-27 19:21:08 +02:00 committed by Florian Müllner
parent fc680556f5
commit ddf03b5d94
4 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -81,7 +81,6 @@ gi_dep = dependency('gobject-introspection-1.0', version: gi_req)
gio_dep = dependency('gio-2.0', version: gio_req) gio_dep = dependency('gio-2.0', version: gio_req)
gio_unix_dep = dependency('gio-unix-2.0', version: gio_req) gio_unix_dep = dependency('gio-unix-2.0', version: gio_req)
gjs_dep = dependency('gjs-1.0', version: gjs_req) gjs_dep = dependency('gjs-1.0', version: gjs_req)
gmodule_dep = dependency('gmodule-2.0')
gtk_dep = dependency('gtk+-3.0', version: gtk_req) gtk_dep = dependency('gtk+-3.0', version: gtk_req)
libxml_dep = dependency('libxml-2.0') libxml_dep = dependency('libxml-2.0')
clutter_dep = dependency(clutter_pc, version: mutter_req) clutter_dep = dependency(clutter_pc, version: mutter_req)

2
src/st/meson.build
View File

@ -180,7 +180,7 @@ st_cflags = [
libst = shared_library('st-1.0', libst = shared_library('st-1.0',
sources: st_gir_sources + st_nogir_sources + croco_sources, sources: st_gir_sources + st_nogir_sources + croco_sources,
c_args: st_cflags, c_args: st_cflags,
dependencies: [clutter_dep, gmodule_dep, gtk_dep, mutter_dep, libxml_dep, m_dep], dependencies: [clutter_dep, gtk_dep, mutter_dep, libxml_dep, m_dep],
build_rpath: mutter_typelibdir, build_rpath: mutter_typelibdir,
install_rpath: mutter_typelibdir, install_rpath: mutter_typelibdir,
install_dir: pkglibdir, install_dir: pkglibdir,

16
src/st/st-viewport.c
View File

@ -80,22 +80,8 @@ adjustment_value_notify_cb (StAdjustment *adjustment,
GParamSpec *pspec, GParamSpec *pspec,
StViewport *viewport) StViewport *viewport)
{ {
static gboolean invalidate_paint_volume_valid = FALSE;
static void (* invalidate_paint_volume) (ClutterActor *) = NULL;
clutter_actor_invalidate_transform (CLUTTER_ACTOR (viewport)); clutter_actor_invalidate_transform (CLUTTER_ACTOR (viewport));
clutter_actor_invalidate_paint_volume (CLUTTER_ACTOR (viewport));
if (!invalidate_paint_volume_valid)
{
g_module_symbol (g_module_open (NULL, G_MODULE_BIND_LAZY),
"clutter_actor_invalidate_paint_volume",
(gpointer *)&invalidate_paint_volume);
invalidate_paint_volume_valid = TRUE;
}
if (invalidate_paint_volume)
invalidate_paint_volume (CLUTTER_ACTOR (viewport));
clutter_actor_queue_relayout (CLUTTER_ACTOR (viewport)); clutter_actor_queue_relayout (CLUTTER_ACTOR (viewport));
} }

14
src/st/st-widget.c
View File

@ -1732,19 +1732,7 @@ st_widget_recompute_style (StWidget *widget,
if (!paint_equal) if (!paint_equal)
{ {
static gboolean invalidate_paint_volume_valid = FALSE; clutter_actor_invalidate_paint_volume (CLUTTER_ACTOR (widget));
static void (* invalidate_paint_volume) (ClutterActor *) = NULL;
if (!invalidate_paint_volume_valid)
{
g_module_symbol (g_module_open (NULL, G_MODULE_BIND_LAZY),
"clutter_actor_invalidate_paint_volume",
(gpointer *)&invalidate_paint_volume);
invalidate_paint_volume_valid = TRUE;
}
if (invalidate_paint_volume)
invalidate_paint_volume (CLUTTER_ACTOR (widget));
next_paint_state (widget); next_paint_state (widget);