summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann <sandmann@redhat.com>2006-03-31 17:13:48 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2006-03-31 17:13:48 +0000
commitf7a202eb81e8ad1cfd2abe216154595fdc90b3d3 (patch)
tree559483e37b9f08d3b975514253196a2aab4ab2ff
parenteb102ab37f7113db39112726057ad7a474b7b2de (diff)
downloadmetacity-f7a202eb81e8ad1cfd2abe216154595fdc90b3d3.tar.gz
Don't hardcode screen size.
Fri Mar 31 12:13:21 2006 Søren Sandmann <sandmann@redhat.com> * src/c-screen.c (meta_screen_info_redirect): Don't hardcode screen size.
-rw-r--r--ChangeLog5
-rw-r--r--src/c-screen.c27
2 files changed, 22 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 44b3bd6e..00478eb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 31 12:13:21 2006 Søren Sandmann <sandmann@redhat.com>
+
+ * src/c-screen.c (meta_screen_info_redirect): Don't hardcode
+ screen size.
+
Thu Mar 30 17:01:12 2006 Søren Sandmann <sandmann@redhat.com>
* src/compositor.c (struct MetaCompositor): Fix the memory
diff --git a/src/c-screen.c b/src/c-screen.c
index 0b104ece..9b1346b6 100644
--- a/src/c-screen.c
+++ b/src/c-screen.c
@@ -276,6 +276,8 @@ meta_screen_info_redirect (MetaScreenInfo *info)
WsRectangle source;
WsRectangle target;
WsServerRegion *region;
+ int screen_w;
+ int screen_h;
#if 0
g_print ("redirecting %lx\n", WS_RESOURCE_XID (root));
@@ -302,19 +304,24 @@ meta_screen_info_redirect (MetaScreenInfo *info)
info->stacker = cm_stacker_new ();
cm_stacker_add_child (info->stacker, cm_square_new (0.3, 0.3, 0.8, 1.0));
-
- source.x = 600;
- source.y = 100;
- source.width = 400;
- source.height = 75;
- target.x = 1300;
- target.y = 900;
- target.width = 300;
- target.height = 300;
+ screen_w = ws_screen_get_width (info->screen);
+ screen_h = ws_screen_get_height (info->screen);
+
+ g_print ("width: %d height %d\n", screen_w, screen_h);
+
+ source.x = (screen_w - (screen_w / 4)) / 2;
+ source.y = screen_h / 16;
+ source.width = screen_w / 4;
+ source.height = screen_h / 16;
+
+ target.x = 0;
+ target.y = screen_h - screen_h / 4;
+ target.width = screen_w;
+ target.height = screen_h / 4;
info->magnifier = cm_magnifier_new (info->stacker, &source, &target);
- cm_magnifier_set_active (info->magnifier, FALSE);
+ cm_magnifier_set_active (info->magnifier, TRUE);
info->repaint_id =
g_signal_connect (info->magnifier, "need_repaint",