summaryrefslogtreecommitdiff
path: root/beryl-plugins
diff options
context:
space:
mode:
authormaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-31 07:39:38 +0000
committermaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-31 07:39:38 +0000
commite2788322b5fe112559ac3cccad6a1985a5b338f4 (patch)
treeb8080c2a1b9a5c29181722667b65ebbaf6a03d8d /beryl-plugins
parenta71a2116fc5120e2a34135271c5f3b96fe87707f (diff)
downloadmarex-dev-e2788322b5fe112559ac3cccad6a1985a5b338f4.tar.gz
marex-dev-e2788322b5fe112559ac3cccad6a1985a5b338f4.tar.bz2
- remove some code unneeded after properly fixing moveResizeWindow
- also use moveResizeWindow on resize cancel - X functions should only be called from core git-svn-id: file:///beryl/trunk@919 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins')
-rw-r--r--beryl-plugins/IPCS_NAMES3
-rw-r--r--beryl-plugins/src/resize.c7
-rw-r--r--beryl-plugins/src/wobbly.c13
3 files changed, 4 insertions, 19 deletions
diff --git a/beryl-plugins/IPCS_NAMES b/beryl-plugins/IPCS_NAMES
index 76069df..f041f8f 100644
--- a/beryl-plugins/IPCS_NAMES
+++ b/beryl-plugins/IPCS_NAMES
@@ -15,6 +15,3 @@ splash:
animation:
Bool IS_ANIMATED : This window is animated
-
-resize & wobbly:
- Bool WOBBLY_WAS_RESIZED : This window was resized and moved, do not move it again
diff --git a/beryl-plugins/src/resize.c b/beryl-plugins/src/resize.c
index b568298..1b054c9 100644
--- a/beryl-plugins/src/resize.c
+++ b/beryl-plugins/src/resize.c
@@ -203,7 +203,6 @@ static void resizeUpdateWindowRealSize (CompDisplay *d, int move_only)
xwc.width = rd->currentWidth;
xwc.height = rd->currentHeight;
- IPCS_SetBoolN (IPCS_OBJECT(rd->w), "WOBBLY_WAS_RESIZED", TRUE);
moveResizeWindow(rd->w, &xwc, xwcm, 0);
}
@@ -383,8 +382,6 @@ static Bool resizeInitiate (CompDisplay *d,
if (!w)
return FALSE;
- IPCS_GetAtom (IPCS_OBJECT(w), IPCS_BOOL, "WOBBLY_WAS_RESIZED", TRUE);
- IPCS_SetBoolN (IPCS_OBJECT(w), "WOBBLY_WAS_RESIZED", FALSE);
rs = GET_RESIZE_SCREEN(w->screen);
rd->dx_to_apply = rd->dy_to_apply = 0;
@@ -543,9 +540,7 @@ static Bool resizeTerminate (CompDisplay *d,
xwc.width = rd->savedAttrib.width;
xwc.height = rd->savedAttrib.height;
- XConfigureWindow (d->display, rd->w->id,
- CWX | CWY | CWWidth | CWHeight,
- &xwc);
+ moveResizeWindow (rd->w, &xwc, CWX | CWY | CWWidth | CWHeight, 0);
} else if (rd->resizeMode == ResizeModeStretch) {
rd->stretch_finish = 1;
(*rd->w->screen->setWindowScale) (rd->w, 1.0f, 1.0f);
diff --git a/beryl-plugins/src/wobbly.c b/beryl-plugins/src/wobbly.c
index 1b3274a..c86b448 100644
--- a/beryl-plugins/src/wobbly.c
+++ b/beryl-plugins/src/wobbly.c
@@ -2313,16 +2313,9 @@ wobblyPreparePaintScreen (CompScreen * s, int msSinceLastPaint)
}
else if (!ww->model->transformed)
{
- if (!(IPCS_GetBoolND (IPCS_OBJECT(w), "WOBBLY_WAS_RESIZED", FALSE))) {
- moveWindow (w,
- model->topLeft.x + w->output.left - w->attrib.x,
- model->topLeft.y + w->output.top - w->attrib.y, TRUE, TRUE);
- } else {
- IPCS_SetBoolN(IPCS_OBJECT(w), "WOBBLY_WAS_RESIZED", FALSE);
- //update the model coordinates to the current ones
- model->topLeft.x = w->attrib.x;
- model->topLeft.y = w->attrib.y;
- }
+ moveWindow (w,
+ model->topLeft.x + w->output.left - w->attrib.x,
+ model->topLeft.y + w->output.top - w->attrib.y, TRUE, TRUE);
ww->model = model;