yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sanitize screenedge activation timer logics

Browse source 
The logics relied on a static timout to arm the timer:
when last successfull activation had been longer ago than 250ms.

We now cap the configured reactivation timeout at min 250m
guessing that this was somehow supposed as well by this.

BUG: 322057
FIXED-IN: 4.11
REVIEW: 111549
This commit is contained in:
Thomas Lübking 2013-07-17 16:39:58 +02:00
parent b6c4f0a7fb
commit 55daad4d68
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
screenedge.cpp
View file

@ -47,8 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace KWin {
// Reset timeout
static const int TRESHOLD_RESET = 250;
// Mouse should not move more than this many pixels
static const int DISTANCE_RESET = 30;
@ -133,7 +131,7 @@ void Edge::check(const QPoint &cursorPos, const QDateTime &triggerTime, bool for
bool directActivate = forceNoPushBack || edges()->cursorPushBackDistance().isNull();
if (directActivate || canActivate(cursorPos, triggerTime)) {
m_lastTrigger = triggerTime;
m_lastReset = triggerTime;
m_lastReset = QDateTime(); // invalidate
handle(cursorPos);
} else {
pushCursorBack(cursorPos);
@ -143,7 +141,11 @@ void Edge::check(const QPoint &cursorPos, const QDateTime &triggerTime, bool for
bool Edge::canActivate(const QPoint &cursorPos, const QDateTime &triggerTime)
{
if (m_lastReset.msecsTo(triggerTime) > TRESHOLD_RESET) {
// we check whether either the timer has explicitly been invalidated (successfull trigger) or is
// bigger than the reactivation threshold (activation "aborted", usually due to moving away the cursor
// from the corner after successfull activation)
// either condition means that "this is the first event in a new attempt"
if (!m_lastReset.isValid() || m_lastReset.msecsTo(triggerTime) > edges()->reActivationThreshold()) {
m_lastReset = triggerTime;
return false;
}