Only use magnifier when USE_MAGNIFIER is set.

Fri Mar 31 12:24:26 2006  Søren Sandmann  <sandmann@redhat.com>

	* src/c-screen.c (meta_screen_info_redirect): Only use magnifier
	when USE_MAGNIFIER is set.

	* src/compositor.c (meta_compositor_free_window): Only wobble when
	USE_WOBBLE is set.
This commit is contained in:
Søren Sandmann 2006-03-31 17:25:02 +00:00 committed by Søren Sandmann Pedersen
parent f7a202eb81
commit 21d5a43c29
3 changed files with 27 additions and 1 deletions

View File

@ -1,3 +1,11 @@
Fri Mar 31 12:24:26 2006 Søren Sandmann <sandmann@redhat.com>
* src/c-screen.c (meta_screen_info_redirect): Only use magnifier
when USE_MAGNIFIER is set.
* src/compositor.c (meta_compositor_free_window): Only wobble when
USE_WOBBLE is set.
Fri Mar 31 12:13:21 2006 Søren Sandmann <sandmann@redhat.com>
* src/c-screen.c (meta_screen_info_redirect): Don't hardcode

View File

@ -321,7 +321,11 @@ meta_screen_info_redirect (MetaScreenInfo *info)
target.height = screen_h / 4;
info->magnifier = cm_magnifier_new (info->stacker, &source, &target);
cm_magnifier_set_active (info->magnifier, TRUE);
if (g_getenv ("USE_MAGNIFIER"))
cm_magnifier_set_active (info->magnifier, TRUE);
else
cm_magnifier_set_active (info->magnifier, FALSE);
info->repaint_id =
g_signal_connect (info->magnifier, "need_repaint",

View File

@ -1344,7 +1344,12 @@ meta_compositor_begin_move (MetaCompositor *compositor,
MetaRectangle rect;
MoveInfo *move_info;
#if 0
g_print ("begin move\n");
#endif
if (!g_getenv ("USE_WOBBLY"))
return;
move_info = g_new0 (MoveInfo, 1);
@ -1400,6 +1405,9 @@ meta_compositor_update_move (MetaCompositor *compositor,
#ifdef HAVE_COMPOSITE_EXTENSIONS
MoveInfo *move_info = find_info (window);
if (!g_getenv ("USE_WOBBLY"))
return;
model_update_move (move_info->model, x, y);
#endif
}
@ -1411,6 +1419,9 @@ meta_compositor_end_move (MetaCompositor *compositor,
#ifdef HAVE_COMPOSITE_EXTENSIONS
MoveInfo *info = find_info (window);
if (!g_getenv ("USE_WOBBLY"))
return;
info->finished = TRUE;
#endif
}
@ -1423,6 +1434,9 @@ meta_compositor_free_window (MetaCompositor *compositor,
#ifdef HAVE_COMPOSITE_EXTENSIONS
MoveInfo *info = find_info (window);
if (!g_getenv ("USE_WOBBLY"))
return;
if (info)
info->window_destroyed = TRUE;
#endif