search for: compactionstatetermbutton

...t -------------- diff --git a/plugins/scale.c b/plugins/scale.c index 7095c2d..94e4258 100644 --- a/plugins/scale.c +++ b/plugins/scale.c @@ -1075,11 +1075,14 @@ scaleInitiate (CompDisplay *d, damageScreen (s); } - if (state & CompActionStateInitButton) - action->state |= CompActionStateTermButton; + if (!(action->edgeMask & d->mouseOnEdge)) + { + if (state & CompActionStateInitButton) + action->state |= CompActionStateTermButton; - if (state & CompActionStateInitKey) - action->state |= CompActionStateTermKey; + if (state & Comp...

...t -------------- diff --git a/plugins/scale.c b/plugins/scale.c index 7095c2d..31864be 100644 --- a/plugins/scale.c +++ b/plugins/scale.c @@ -1075,11 +1075,14 @@ scaleInitiate (CompDisplay *d, damageScreen (s); } - if (state & CompActionStateInitButton) - action->state |= CompActionStateTermButton; + if (!(action->edgeMask & d->mouseOnEdge)) + { + if (state & CompActionStateInitButton) + action->state |= CompActionStateTermButton; - if (state & CompActionStateInitKey) - action->state |= CompActionStateTermKey; + if (state & Comp...

...> index 7095c2d..31864be 100644 > --- a/plugins/scale.c > +++ b/plugins/scale.c > @@ -1075,11 +1075,14 @@ scaleInitiate (CompDisplay *d, > damageScreen (s); > } > > - if (state & CompActionStateInitButton) > - action->state |= CompActionStateTermButton; > + if (!(action->edgeMask & d->mouseOnEdge)) > + { > + if (state & CompActionStateInitButton) > + action->state |= CompActionStateTermButton; > > - if (state & CompActionStateInitKey) > - action->stat...

--- include/compiz.h | 17 ++++++- metadata/core.xml.in | 7 +++ src/display.c | 5 ++- src/event.c | 130 +++++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 143 insertions(+), 16 deletions(-) diff --git a/include/compiz.h b/include/compiz.h index dd34f00..abb1169 100644 --- a/include/compiz.h +++ b/include/compiz.h @@ -26,7 +26,7 @@ #ifndef

...+ + annoDrawLine (s, as->startX, as->startY, + pointerX, pointerY, + lineWidth, fillColor); + + } + } + } + + removeScreenGrab (s, as->grabIndex, NULL); + as->grabIndex = 0; + } + } + + action->state &= ~(CompActionStateTermKey | CompActionStateTermButton); + + return FALSE; +} + +static Bool +annoEraseTerminate (CompDisplay *d, + CompAction *action, + CompActionState state, + CompOption *option, + int nOption) +{ CompScreen *s; Window xid; @@ -267,6 +720,7 @@ cr = annoCairoContex...