[dasher] Code tidy to StylusFilter, missed from 13563f987132a61ff53ae36c80054ce32e2e6be8
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher] Code tidy to StylusFilter, missed from 13563f987132a61ff53ae36c80054ce32e2e6be8
- Date: Wed, 9 Jun 2010 12:50:06 +0000 (UTC)
commit b445d26a634632ee1238043f2d6b4ba10190788c
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date: Tue Jun 1 17:09:18 2010 +0100
Code tidy to StylusFilter, missed from 13563f987132a61ff53ae36c80054ce32e2e6be8
Src/DasherCore/StylusFilter.cpp | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/Src/DasherCore/StylusFilter.cpp b/Src/DasherCore/StylusFilter.cpp
index 1232f91..aa83b1a 100644
--- a/Src/DasherCore/StylusFilter.cpp
+++ b/Src/DasherCore/StylusFilter.cpp
@@ -11,16 +11,12 @@ CStylusFilter::CStylusFilter(Dasher::CEventHandler *pEventHandler, CSettingsStor
bool CStylusFilter::Timer(int iTime, CDasherView *pView, CDasherModel *pModel, Dasher::VECTOR_SYMBOL_PROB *pAdded, int *pNumDeleted, CExpansionPolicy **pol)
{
- if (pModel->NextScheduledStep(iTime, pAdded, pNumDeleted))
- return true;
- return CDefaultFilter::Timer(iTime, pView, pModel, pAdded, pNumDeleted, pol);
- if (GetBoolParameter(BP_DASHER_PAUSED))
- {
- //continue any zoom scheduled by a previous click...
- return pModel->NextScheduledStep(iTime, pAdded, pNumDeleted);
+ //First, try to continue any zoom scheduled by a previous click...
+ if (pModel->NextScheduledStep(iTime, pAdded, pNumDeleted)) {
//note that this skips the rest of CDefaultFilter::Timer;
//however, given we're paused, this is only the Start Handler,
//which we're not using anyway.
+ return true;
}
return CDefaultFilter::Timer(iTime, pView, pModel, pAdded, pNumDeleted, pol);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]