equal
deleted
inserted
replaced
35 // It lists the timeout dt values in microseconds. |
35 // It lists the timeout dt values in microseconds. |
36 const int KDecelCurveSize = 10; |
36 const int KDecelCurveSize = 10; |
37 |
37 |
38 const int KScrollIntervalTimeout = 60000; // scroll timer interval in microseconds |
38 const int KScrollIntervalTimeout = 60000; // scroll timer interval in microseconds |
39 |
39 |
40 const float KDeccelerationLow = -350.0; |
40 const float KDecceleration = -750.0; |
41 const float KDeccelerationHigh = -600.0; |
|
42 const float KSpeedHigh = 2000.0; |
41 const float KSpeedHigh = 2000.0; |
43 |
42 |
44 int decelTimerCB(TAny* ptr); |
43 int decelTimerCB(TAny* ptr); |
45 |
44 |
46 |
45 |
77 // WebScrollingDeceleratorGH::ConstructL |
76 // WebScrollingDeceleratorGH::ConstructL |
78 // ----------------------------------------------------------------------------- |
77 // ----------------------------------------------------------------------------- |
79 void WebScrollingDeceleratorGH::ConstructL() |
78 void WebScrollingDeceleratorGH::ConstructL() |
80 { |
79 { |
81 m_decelTimer = CPeriodic::NewL(CActive::EPriorityStandard); |
80 m_decelTimer = CPeriodic::NewL(CActive::EPriorityStandard); |
82 m_deceleration = KDeccelerationHigh; |
81 m_deceleration = KDecceleration; |
83 } |
82 } |
84 |
83 |
85 // ----------------------------------------------------------------------------- |
84 // ----------------------------------------------------------------------------- |
86 // Destructor |
85 // Destructor |
87 // ----------------------------------------------------------------------------- |
86 // ----------------------------------------------------------------------------- |
123 float absSpeedX = abs(speedX); |
122 float absSpeedX = abs(speedX); |
124 float absSpeedY = abs(speedY); |
123 float absSpeedY = abs(speedY); |
125 |
124 |
126 if (absSpeedX > KSpeedHigh) { |
125 if (absSpeedX > KSpeedHigh) { |
127 speedX = KSpeedHigh * speedX/absSpeedX ; |
126 speedX = KSpeedHigh * speedX/absSpeedX ; |
128 m_deceleration = KDeccelerationLow; |
|
129 } |
127 } |
130 if (absSpeedY > KSpeedHigh) { |
128 if (absSpeedY > KSpeedHigh) { |
131 speedY = KSpeedHigh * speedY/absSpeedY; |
129 speedY = KSpeedHigh * speedY/absSpeedY; |
132 m_deceleration = KDeccelerationLow; |
|
133 } |
130 } |
134 |
131 |
135 m_initSpeed.iX = (-1) * speedX; |
132 m_initSpeed.iX = (-1) * speedX; |
136 m_initSpeed.iY = (-1) * speedY; |
133 m_initSpeed.iY = (-1) * speedY; |
137 |
134 |