diff options
| author | maniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3> | 2007-01-11 19:07:41 +0000 |
|---|---|---|
| committer | maniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3> | 2007-01-11 19:07:41 +0000 |
| commit | c80c397d702cb3ea8dc6afd3fa7baa3d45bbe4dd (patch) | |
| tree | 45a1c0153f692249694f64fd60355cacde564afa /beryl-plugins/src/rotate.c | |
| parent | e55f7d8b437426fa31baadda95ca88ef97266da6 (diff) | |
| download | marex-dev-c80c397d702cb3ea8dc6afd3fa7baa3d45bbe4dd.tar.gz marex-dev-c80c397d702cb3ea8dc6afd3fa7baa3d45bbe4dd.tar.bz2 | |
beryl-plugins: prevent rotation while scale is active (while still maintaining the intersection of animations), closes #379
git-svn-id: file:///beryl/trunk@2613 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/rotate.c')
| -rw-r--r-- | beryl-plugins/src/rotate.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/beryl-plugins/src/rotate.c b/beryl-plugins/src/rotate.c index 7709289..dde7913 100644 --- a/beryl-plugins/src/rotate.c +++ b/beryl-plugins/src/rotate.c @@ -1171,6 +1171,17 @@ rotate(CompDisplay * d, (s, "rotate", "move", "switcher", "cube", "scale", 0)) return FALSE; + /* FIXME: this is sort of a hack - we check if + the state of scale is "waiting for user + we definitely need a better communication + mechanism here... */ + + int *scaleState = (int*) IPCS_GetVPtrND(IPCS_OBJECT(s), + "SCALE_STATE_INT_PTR", NULL); + + if (scaleState && (*scaleState == 2)) + return FALSE; + direction = getIntOptionNamed(option, nOption, "direction", 0); if (!direction) return FALSE; |