summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-03-14 23:47:56 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-03-14 23:47:56 +0800
commit6797f27569960cf568fa4fd7f4003b02659d0946 (patch)
tree3020fb41f29fc274b75c79cbeef61ab63f90f423
parentea33ac6f376f02ed8ae0e097baa9f7bffd9a2a07 (diff)
downloadshowdesktop-6797f27569960cf568fa4fd7f4003b02659d0946.tar.gz
showdesktop-6797f27569960cf568fa4fd7f4003b02659d0946.tar.bz2
Adapt for new core API
-rw-r--r--src/showdesktop.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/showdesktop.h b/src/showdesktop.h
index 81d91fc..2e42659 100644
--- a/src/showdesktop.h
+++ b/src/showdesktop.h
@@ -41,15 +41,15 @@
#include "showdesktop_options.h"
-#define WIN_X(w) ((w)->x () - (w)->input ().left)
-#define WIN_Y(w) ((w)->y () - (w)->input ().top)
-#define WIN_W(w) ((w)->width () + (w)->input ().left + (w)->input ().right)
-#define WIN_H(w) ((w)->height () + (w)->input ().top + (w)->input ().bottom)
-
-#define OFF_LEFT(w) ((w)->width () + (w)->input ().right)
-#define OFF_RIGHT(w) ((w)->input ().left)
-#define OFF_TOP(w) ((w)->height () + (w)->input ().bottom)
-#define OFF_BOTTOM(w) ((w)->input ().top)
+#define WIN_X(w) ((w)->x () - (w)->border ().left)
+#define WIN_Y(w) ((w)->y () - (w)->border ().top)
+#define WIN_W(w) ((w)->width () + (w)->border ().left + (w)->border ().right)
+#define WIN_H(w) ((w)->height () + (w)->border ().top + (w)->border ().bottom)
+
+#define OFF_LEFT(w) ((w)->width () + (w)->border ().right)
+#define OFF_RIGHT(w) ((w)->border ().left)
+#define OFF_TOP(w) ((w)->height () + (w)->border ().bottom)
+#define OFF_BOTTOM(w) ((w)->border ().top)
#define MOVE_LEFT(w) ((WIN_X (w) + (WIN_W (w) / 2)) < (screen->width () / 2))
#define MOVE_UP(w) ((WIN_Y (w) + (WIN_H (w) / 2)) < (screen->height () / 2))