Peter M. Groen / dali-demo

Commit e3080a83ec85e14ec8cbf82831fd73b152c6e86a

Authored by György Straub
1 parent 697a682a

Renamed KeyEvent enum values to comply with coding standards. 

Change-Id: I1152c0c48795f8972f2b4ee2fc50b0c04140a322
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Inline Side-by-side
Showing 107 changed files with 113 additions and 113 deletions
builder/dali-builder.cpp
  View file @e3080a8
@@ -280,7 +280,7 @@ private: @@ -280,7 +280,7 @@ private:
280 // Process Key events to Quit on back-key 280 // Process Key events to Quit on back-key
281 void OnKeyEvent( const KeyEvent& event ) 281 void OnKeyEvent( const KeyEvent& event )
282 { 282 {
283 - if( event.GetState() == KeyEvent::Down ) 283 + if( event.GetState() == KeyEvent::DOWN )
284 { 284 {
285 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 285 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
286 { 286 {
examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
  View file @e3080a8
@@ -131,7 +131,7 @@ private: @@ -131,7 +131,7 @@ private:
131 131
132 void OnKeyEvent(const KeyEvent& event) 132 void OnKeyEvent(const KeyEvent& event)
133 { 133 {
134 - if(event.GetState() == KeyEvent::Down) 134 + if(event.GetState() == KeyEvent::DOWN)
135 { 135 {
136 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 136 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
137 { 137 {
examples/animated-gradient-call-active/animated-gradient-call-active.cpp
  View file @e3080a8
@@ -163,7 +163,7 @@ public: @@ -163,7 +163,7 @@ public:
163 163
164 void OnKeyEvent(const KeyEvent& event) 164 void OnKeyEvent(const KeyEvent& event)
165 { 165 {
166 - if( event.GetState() == KeyEvent::Down ) 166 + if( event.GetState() == KeyEvent::DOWN )
167 { 167 {
168 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 168 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
169 { 169 {
examples/animated-gradient-card-active/animated-gradient-card-active.cpp
  View file @e3080a8
@@ -425,7 +425,7 @@ public: @@ -425,7 +425,7 @@ public:
425 425
426 void OnKeyEvent(const KeyEvent& event) 426 void OnKeyEvent(const KeyEvent& event)
427 { 427 {
428 - if( event.GetState() == KeyEvent::Down ) 428 + if( event.GetState() == KeyEvent::DOWN )
429 { 429 {
430 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 430 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
431 { 431 {
examples/animated-images/animated-images-example.cpp
  View file @e3080a8
@@ -291,7 +291,7 @@ private: @@ -291,7 +291,7 @@ private:
291 */ 291 */
292 void OnKeyEvent(const KeyEvent& event) 292 void OnKeyEvent(const KeyEvent& event)
293 { 293 {
294 - if(event.GetState() == KeyEvent::Down) 294 + if(event.GetState() == KeyEvent::DOWN)
295 { 295 {
296 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 296 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
297 { 297 {
examples/animated-shapes/animated-shapes-example.cpp
  View file @e3080a8
@@ -445,7 +445,7 @@ public: @@ -445,7 +445,7 @@ public:
445 */ 445 */
446 void OnKeyEvent(const KeyEvent& event) 446 void OnKeyEvent(const KeyEvent& event)
447 { 447 {
448 - if( event.GetState() == KeyEvent::Down && (IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK )) ) 448 + if( event.GetState() == KeyEvent::DOWN && (IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK )) )
449 { 449 {
450 mApplication.Quit(); 450 mApplication.Quit();
451 } 451 }
examples/animated-vector-images/animated-vector-images-example.cpp
  View file @e3080a8
@@ -201,7 +201,7 @@ private: @@ -201,7 +201,7 @@ private:
201 */ 201 */
202 void OnKeyEvent( const KeyEvent& event ) 202 void OnKeyEvent( const KeyEvent& event )
203 { 203 {
204 - if( event.GetState() == KeyEvent::Down ) 204 + if( event.GetState() == KeyEvent::DOWN )
205 { 205 {
206 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 206 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
207 { 207 {
examples/arc-visual/arc-visual-example.cpp
  View file @e3080a8
@@ -229,7 +229,7 @@ private: @@ -229,7 +229,7 @@ private:
229 229
230 void OnKeyEvent( const KeyEvent& event ) 230 void OnKeyEvent( const KeyEvent& event )
231 { 231 {
232 - if( event.GetState() == KeyEvent::Up ) 232 + if( event.GetState() == KeyEvent::UP )
233 { 233 {
234 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 234 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
235 { 235 {
examples/benchmark/benchmark.cpp
  View file @e3080a8
@@ -451,7 +451,7 @@ public: @@ -451,7 +451,7 @@ public:
451 451
452 void OnKeyEvent( const KeyEvent& event ) 452 void OnKeyEvent( const KeyEvent& event )
453 { 453 {
454 - if( event.GetState() == KeyEvent::Down ) 454 + if( event.GetState() == KeyEvent::DOWN )
455 { 455 {
456 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 456 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
457 { 457 {
examples/bezier-curve/bezier-curve-example.cpp
  View file @e3080a8
@@ -573,7 +573,7 @@ public: @@ -573,7 +573,7 @@ public:
573 void OnKeyEvent(const KeyEvent& event) 573 void OnKeyEvent(const KeyEvent& event)
574 { 574 {
575 575
576 - if( event.GetState() == KeyEvent::Down && (IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK )) ) 576 + if( event.GetState() == KeyEvent::DOWN && (IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK )) )
577 { 577 {
578 mApplication.Quit(); 578 mApplication.Quit();
579 } 579 }
examples/blocks/blocks-example.cpp
  View file @e3080a8
@@ -826,7 +826,7 @@ private: @@ -826,7 +826,7 @@ private:
826 */ 826 */
827 void OnKeyEvent(const KeyEvent& event) 827 void OnKeyEvent(const KeyEvent& event)
828 { 828 {
829 - if(event.GetState() == KeyEvent::Down) 829 + if(event.GetState() == KeyEvent::DOWN)
830 { 830 {
831 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 831 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
832 { 832 {
examples/bloom-view/bloom-view-example.cpp
  View file @e3080a8
@@ -130,7 +130,7 @@ public: @@ -130,7 +130,7 @@ public:
130 130
131 void OnKeyEvent( const KeyEvent& event ) 131 void OnKeyEvent( const KeyEvent& event )
132 { 132 {
133 - if( event.GetState() == KeyEvent::Down ) 133 + if( event.GetState() == KeyEvent::DOWN )
134 { 134 {
135 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 135 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
136 { 136 {
examples/bubble-effect/bubble-effect-example.cpp
  View file @e3080a8
@@ -270,7 +270,7 @@ private: @@ -270,7 +270,7 @@ private:
270 */ 270 */
271 void OnKeyEvent(const KeyEvent& event) 271 void OnKeyEvent(const KeyEvent& event)
272 { 272 {
273 - if(event.GetState() == KeyEvent::Down) 273 + if(event.GetState() == KeyEvent::DOWN)
274 { 274 {
275 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 275 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
276 { 276 {
examples/builder/examples.cpp
  View file @e3080a8
@@ -532,7 +532,7 @@ public: @@ -532,7 +532,7 @@ public:
532 */ 532 */
533 void OnKeyEvent(const KeyEvent& event) 533 void OnKeyEvent(const KeyEvent& event)
534 { 534 {
535 - if(event.GetState() == KeyEvent::Down) 535 + if(event.GetState() == KeyEvent::DOWN)
536 { 536 {
537 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 537 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
538 { 538 {
examples/buttons/buttons-example.cpp
  View file @e3080a8
@@ -359,7 +359,7 @@ class ButtonsController: public ConnectionTracker @@ -359,7 +359,7 @@ class ButtonsController: public ConnectionTracker
359 359
360 void OnKeyEvent( const KeyEvent& event ) 360 void OnKeyEvent( const KeyEvent& event )
361 { 361 {
362 - if( event.GetState() == KeyEvent::Down ) 362 + if( event.GetState() == KeyEvent::DOWN )
363 { 363 {
364 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 364 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
365 { 365 {
examples/clipping-draw-order/clipping-draw-order.cpp
  View file @e3080a8
@@ -216,7 +216,7 @@ public: @@ -216,7 +216,7 @@ public:
216 */ 216 */
217 void OnKeyEvent( const KeyEvent& event ) 217 void OnKeyEvent( const KeyEvent& event )
218 { 218 {
219 - if( event.GetState() == KeyEvent::Down ) 219 + if( event.GetState() == KeyEvent::DOWN )
220 { 220 {
221 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 221 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
222 { 222 {
examples/clipping/clipping-example.cpp
  View file @e3080a8
@@ -172,7 +172,7 @@ private: @@ -172,7 +172,7 @@ private:
172 */ 172 */
173 void OnKeyEvent( const KeyEvent& event ) 173 void OnKeyEvent( const KeyEvent& event )
174 { 174 {
175 - if( event.GetState() == KeyEvent::Down ) 175 + if( event.GetState() == KeyEvent::DOWN )
176 { 176 {
177 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 177 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
178 { 178 {
examples/color-visual/color-visual-example.cpp
  View file @e3080a8
@@ -117,7 +117,7 @@ public: @@ -117,7 +117,7 @@ public:
117 117
118 void OnKeyEvent( const KeyEvent& event ) 118 void OnKeyEvent( const KeyEvent& event )
119 { 119 {
120 - if( event.GetState() == KeyEvent::Down ) 120 + if( event.GetState() == KeyEvent::DOWN )
121 { 121 {
122 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 122 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
123 { 123 {
examples/compressed-texture-formats/compressed-texture-formats-example.cpp
  View file @e3080a8
@@ -190,7 +190,7 @@ public: @@ -190,7 +190,7 @@ public:
190 190
191 void OnKeyEvent(const KeyEvent& event) 191 void OnKeyEvent(const KeyEvent& event)
192 { 192 {
193 - if(event.GetState() == KeyEvent::Down) 193 + if(event.GetState() == KeyEvent::DOWN)
194 { 194 {
195 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 195 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
196 { 196 {
examples/contact-cards/contact-card.cpp
  View file @e3080a8
@@ -327,7 +327,7 @@ void ContactCard::OnAnimationFinished( Animation&amp; animation ) @@ -327,7 +327,7 @@ void ContactCard::OnAnimationFinished( Animation&amp; animation )
327 void ContactCard::OnKeyEvent( const KeyEvent& event ) 327 void ContactCard::OnKeyEvent( const KeyEvent& event )
328 { 328 {
329 if( ( ! mFolded ) && // If we're folded then there's no need to do any more checking 329 if( ( ! mFolded ) && // If we're folded then there's no need to do any more checking
330 - ( event.GetState() == KeyEvent::Down ) ) 330 + ( event.GetState() == KeyEvent::DOWN ) )
331 { 331 {
332 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 332 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
333 { 333 {
examples/contact-cards/contact-cards-example.cpp
  View file @e3080a8
@@ -98,7 +98,7 @@ private: @@ -98,7 +98,7 @@ private:
98 */ 98 */
99 void OnKeyEvent( const KeyEvent& event ) 99 void OnKeyEvent( const KeyEvent& event )
100 { 100 {
101 - if( event.GetState() == KeyEvent::Down ) 101 + if( event.GetState() == KeyEvent::DOWN )
102 { 102 {
103 KeyInputFocusManager keyInputFocusManager = KeyInputFocusManager::Get(); 103 KeyInputFocusManager keyInputFocusManager = KeyInputFocusManager::Get();
104 if( ! keyInputFocusManager.GetCurrentFocusControl() ) // Don't quit if a control has focus 104 if( ! keyInputFocusManager.GetCurrentFocusControl() ) // Don't quit if a control has focus
examples/cube-transition-effect/cube-transition-effect-example.cpp
  View file @e3080a8
@@ -403,7 +403,7 @@ Texture CubeTransitionApp::LoadWindowFillingTexture( const char* filepath ) @@ -403,7 +403,7 @@ Texture CubeTransitionApp::LoadWindowFillingTexture( const char* filepath )
403 403
404 void CubeTransitionApp::OnKeyEvent(const KeyEvent& event) 404 void CubeTransitionApp::OnKeyEvent(const KeyEvent& event)
405 { 405 {
406 - if(event.GetState() == KeyEvent::Down) 406 + if(event.GetState() == KeyEvent::DOWN)
407 { 407 {
408 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 408 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
409 { 409 {
examples/deferred-shading/deferred-shading.cpp
  View file @e3080a8
@@ -777,7 +777,7 @@ private: @@ -777,7 +777,7 @@ private:
777 777
778 void OnKeyEvent(const KeyEvent& event) 778 void OnKeyEvent(const KeyEvent& event)
779 { 779 {
780 - if(event.GetState() == KeyEvent::Down) 780 + if(event.GetState() == KeyEvent::DOWN)
781 { 781 {
782 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 782 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
783 { 783 {
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @e3080a8
@@ -327,7 +327,7 @@ void DissolveEffectApp::StartTransition(Vector2 position, Vector2 displacement) @@ -327,7 +327,7 @@ void DissolveEffectApp::StartTransition(Vector2 position, Vector2 displacement)
327 327
328 void DissolveEffectApp::OnKeyEvent(const KeyEvent& event) 328 void DissolveEffectApp::OnKeyEvent(const KeyEvent& event)
329 { 329 {
330 - if(event.GetState() == KeyEvent::Down) 330 + if(event.GetState() == KeyEvent::DOWN)
331 { 331 {
332 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 332 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
333 { 333 {
examples/drag-and-drop/drag-and-drop-example.cpp
  View file @e3080a8
@@ -118,7 +118,7 @@ public: @@ -118,7 +118,7 @@ public:
118 118
119 void OnKeyEvent( const KeyEvent& event ) 119 void OnKeyEvent( const KeyEvent& event )
120 { 120 {
121 - if( event.GetState() == KeyEvent::Down ) 121 + if( event.GetState() == KeyEvent::DOWN )
122 { 122 {
123 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 123 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
124 { 124 {
examples/effects-view/effects-view-example.cpp
  View file @e3080a8
@@ -234,7 +234,7 @@ bool EffectsViewApp::ChangeEffectSize( Button button ) @@ -234,7 +234,7 @@ bool EffectsViewApp::ChangeEffectSize( Button button )
234 234
235 void EffectsViewApp::OnKeyEvent(const KeyEvent& event) 235 void EffectsViewApp::OnKeyEvent(const KeyEvent& event)
236 { 236 {
237 - if(event.GetState() == KeyEvent::Down) 237 + if(event.GetState() == KeyEvent::DOWN)
238 { 238 {
239 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 239 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
240 { 240 {
examples/flex-container/flex-container-example.cpp
  View file @e3080a8
@@ -330,7 +330,7 @@ private: @@ -330,7 +330,7 @@ private:
330 */ 330 */
331 void OnKeyEvent(const KeyEvent& event) 331 void OnKeyEvent(const KeyEvent& event)
332 { 332 {
333 - if(event.GetState() == KeyEvent::Down) 333 + if(event.GetState() == KeyEvent::DOWN)
334 { 334 {
335 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 335 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
336 { 336 {
examples/focus-integration/focus-integration.cpp
  View file @e3080a8
@@ -175,7 +175,7 @@ private: @@ -175,7 +175,7 @@ private:
175 */ 175 */
176 void OnKeyEvent(const KeyEvent& event) 176 void OnKeyEvent(const KeyEvent& event)
177 { 177 {
178 - if(event.GetState() == KeyEvent::Down) 178 + if(event.GetState() == KeyEvent::DOWN)
179 { 179 {
180 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 180 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
181 { 181 {
examples/fpp-game/fpp-game-example.cpp
  View file @e3080a8
@@ -114,7 +114,7 @@ public: @@ -114,7 +114,7 @@ public:
114 // Handle a quit key event 114 // Handle a quit key event
115 void OnKeyEvent(const KeyEvent& event) 115 void OnKeyEvent(const KeyEvent& event)
116 { 116 {
117 - if(event.GetState() == KeyEvent::Down) 117 + if(event.GetState() == KeyEvent::DOWN)
118 { 118 {
119 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 119 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
120 { 120 {
examples/frame-callback/frame-callback-example.cpp
  View file @e3080a8
@@ -165,7 +165,7 @@ private: @@ -165,7 +165,7 @@ private:
165 */ 165 */
166 void OnKeyEvent( const KeyEvent& event ) 166 void OnKeyEvent( const KeyEvent& event )
167 { 167 {
168 - if( event.GetState() == KeyEvent::Down ) 168 + if( event.GetState() == KeyEvent::DOWN )
169 { 169 {
170 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 170 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
171 { 171 {
examples/gaussian-blur-view/gaussian-blur-view-example.cpp
  View file @e3080a8
@@ -142,7 +142,7 @@ private: @@ -142,7 +142,7 @@ private:
142 142
143 void OnKeyEvent(const KeyEvent& event) 143 void OnKeyEvent(const KeyEvent& event)
144 { 144 {
145 - if(event.GetState() == KeyEvent::Down) 145 + if(event.GetState() == KeyEvent::DOWN)
146 { 146 {
147 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 147 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
148 { 148 {
examples/gestures/gesture-example.cpp
  View file @e3080a8
@@ -453,7 +453,7 @@ private: @@ -453,7 +453,7 @@ private:
453 */ 453 */
454 void OnKeyEvent( const KeyEvent& event ) 454 void OnKeyEvent( const KeyEvent& event )
455 { 455 {
456 - if( event.GetState() == KeyEvent::Down ) 456 + if( event.GetState() == KeyEvent::DOWN )
457 { 457 {
458 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 458 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
459 { 459 {
examples/gradients/gradients-example.cpp
  View file @e3080a8
@@ -183,7 +183,7 @@ public: @@ -183,7 +183,7 @@ public:
183 183
184 void OnKeyEvent(const KeyEvent& event) 184 void OnKeyEvent(const KeyEvent& event)
185 { 185 {
186 - if(event.GetState() == KeyEvent::Down) 186 + if(event.GetState() == KeyEvent::DOWN)
187 { 187 {
188 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 188 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
189 { 189 {
examples/hello-world/hello-world-example.cpp
  View file @e3080a8
@@ -63,7 +63,7 @@ public: @@ -63,7 +63,7 @@ public:
63 63
64 void OnKeyEvent( const KeyEvent& event ) 64 void OnKeyEvent( const KeyEvent& event )
65 { 65 {
66 - if( event.GetState() == KeyEvent::Down ) 66 + if( event.GetState() == KeyEvent::DOWN )
67 { 67 {
68 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 68 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
69 { 69 {
examples/homescreen-benchmark/homescreen-benchmark.cpp
  View file @e3080a8
@@ -446,7 +446,7 @@ public: @@ -446,7 +446,7 @@ public:
446 446
447 void OnKeyEvent( const KeyEvent& event ) 447 void OnKeyEvent( const KeyEvent& event )
448 { 448 {
449 - if( event.GetState() == KeyEvent::Down ) 449 + if( event.GetState() == KeyEvent::DOWN )
450 { 450 {
451 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 451 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
452 { 452 {
examples/image-policies/image-policies-example.cpp
  View file @e3080a8
@@ -525,7 +525,7 @@ private: @@ -525,7 +525,7 @@ private:
525 */ 525 */
526 void OnKeyEvent(const KeyEvent& event) 526 void OnKeyEvent(const KeyEvent& event)
527 { 527 {
528 - if(event.GetState() == KeyEvent::Down) 528 + if(event.GetState() == KeyEvent::DOWN)
529 { 529 {
530 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 530 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
531 { 531 {
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @e3080a8
@@ -566,7 +566,7 @@ public: @@ -566,7 +566,7 @@ public:
566 566
567 void OnKeyEvent(const KeyEvent& event) 567 void OnKeyEvent(const KeyEvent& event)
568 { 568 {
569 - if( event.GetState() == KeyEvent::Down ) 569 + if( event.GetState() == KeyEvent::DOWN )
570 { 570 {
571 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 571 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
572 { 572 {
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @e3080a8
@@ -542,7 +542,7 @@ public: @@ -542,7 +542,7 @@ public:
542 */ 542 */
543 void OnKeyEvent(const KeyEvent& event) 543 void OnKeyEvent(const KeyEvent& event)
544 { 544 {
545 - if( event.GetState() == KeyEvent::Down ) 545 + if( event.GetState() == KeyEvent::DOWN )
546 { 546 {
547 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) 547 if( IsKey( event, Dali::DALI_KEY_ESCAPE )
548 || IsKey( event, Dali::DALI_KEY_BACK ) ) 548 || IsKey( event, Dali::DALI_KEY_BACK ) )
examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp
  View file @e3080a8
@@ -88,7 +88,7 @@ private: @@ -88,7 +88,7 @@ private:
88 88
89 void OnKeyEvent(const KeyEvent& event) 89 void OnKeyEvent(const KeyEvent& event)
90 { 90 {
91 - if(event.GetState() == KeyEvent::Down) 91 + if(event.GetState() == KeyEvent::DOWN)
92 { 92 {
93 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 93 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
94 { 94 {
examples/image-view-pixel-area/image-view-pixel-area-example.cpp
  View file @e3080a8
@@ -213,7 +213,7 @@ private: @@ -213,7 +213,7 @@ private:
213 213
214 void OnKeyEvent(const KeyEvent& event) 214 void OnKeyEvent(const KeyEvent& event)
215 { 215 {
216 - if(event.GetState() == KeyEvent::Down) 216 + if(event.GetState() == KeyEvent::DOWN)
217 { 217 {
218 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 218 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
219 { 219 {
examples/image-view-svg/image-view-svg-example.cpp
  View file @e3080a8
@@ -209,7 +209,7 @@ public: @@ -209,7 +209,7 @@ public:
209 */ 209 */
210 void OnKeyEvent(const KeyEvent& event) 210 void OnKeyEvent(const KeyEvent& event)
211 { 211 {
212 - if(event.GetState() == KeyEvent::Down) 212 + if(event.GetState() == KeyEvent::DOWN)
213 { 213 {
214 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 214 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
215 { 215 {
examples/image-view-url/image-view-url-example.cpp
  View file @e3080a8
@@ -186,7 +186,7 @@ private: @@ -186,7 +186,7 @@ private:
186 186
187 void OnKeyEvent(const KeyEvent& event) 187 void OnKeyEvent(const KeyEvent& event)
188 { 188 {
189 - if(event.GetState() == KeyEvent::Down) 189 + if(event.GetState() == KeyEvent::DOWN)
190 { 190 {
191 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 191 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
192 { 192 {
examples/image-view/image-view-example.cpp
  View file @e3080a8
@@ -260,7 +260,7 @@ private: @@ -260,7 +260,7 @@ private:
260 */ 260 */
261 void OnKeyEvent(const KeyEvent& event) 261 void OnKeyEvent(const KeyEvent& event)
262 { 262 {
263 - if(event.GetState() == KeyEvent::Down) 263 + if(event.GetState() == KeyEvent::DOWN)
264 { 264 {
265 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 265 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
266 { 266 {
examples/item-view/item-view-example.cpp
  View file @e3080a8
@@ -963,7 +963,7 @@ private: @@ -963,7 +963,7 @@ private:
963 */ 963 */
964 void OnKeyEvent(const KeyEvent& event) 964 void OnKeyEvent(const KeyEvent& event)
965 { 965 {
966 - if(event.GetState() == KeyEvent::Down) 966 + if(event.GetState() == KeyEvent::DOWN)
967 { 967 {
968 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 968 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
969 { 969 {
examples/line-mesh/line-mesh-example.cpp
  View file @e3080a8
@@ -310,7 +310,7 @@ public: @@ -310,7 +310,7 @@ public:
310 310
311 void OnKeyEvent(const KeyEvent& event) 311 void OnKeyEvent(const KeyEvent& event)
312 { 312 {
313 - if(event.GetState() == KeyEvent::Down) 313 + if(event.GetState() == KeyEvent::DOWN)
314 { 314 {
315 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 315 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
316 { 316 {
examples/magnifier/magnifier-example.cpp
  View file @e3080a8
@@ -376,7 +376,7 @@ public: @@ -376,7 +376,7 @@ public:
376 376
377 void OnKeyEvent(const KeyEvent& event) 377 void OnKeyEvent(const KeyEvent& event)
378 { 378 {
379 - if(event.GetState() == KeyEvent::Down) 379 + if(event.GetState() == KeyEvent::DOWN)
380 { 380 {
381 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 381 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
382 { 382 {
examples/mesh-morph/mesh-morph-example.cpp
  View file @e3080a8
@@ -326,7 +326,7 @@ public: @@ -326,7 +326,7 @@ public:
326 326
327 void OnKeyEvent(const KeyEvent& event) 327 void OnKeyEvent(const KeyEvent& event)
328 { 328 {
329 - if(event.GetState() == KeyEvent::Down) 329 + if(event.GetState() == KeyEvent::DOWN)
330 { 330 {
331 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 331 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
332 { 332 {
examples/mesh-visual/mesh-visual-example.cpp
  View file @e3080a8
@@ -572,7 +572,7 @@ public: @@ -572,7 +572,7 @@ public:
572 //If escape or the back button is pressed, quit the application (and return to the launcher) 572 //If escape or the back button is pressed, quit the application (and return to the launcher)
573 void OnKeyEvent( const KeyEvent& event ) 573 void OnKeyEvent( const KeyEvent& event )
574 { 574 {
575 - if( event.GetState() == KeyEvent::Down ) 575 + if( event.GetState() == KeyEvent::DOWN )
576 { 576 {
577 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 577 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
578 { 578 {
examples/metaball-explosion/metaball-explosion-example.cpp
  View file @e3080a8
@@ -667,7 +667,7 @@ bool MetaballExplosionController::OnTouch( Actor actor, const TouchEvent&amp; touch @@ -667,7 +667,7 @@ bool MetaballExplosionController::OnTouch( Actor actor, const TouchEvent&amp; touch
667 667
668 void MetaballExplosionController::OnKeyEvent(const KeyEvent& event) 668 void MetaballExplosionController::OnKeyEvent(const KeyEvent& event)
669 { 669 {
670 - if(event.GetState() == KeyEvent::Down) 670 + if(event.GetState() == KeyEvent::DOWN)
671 { 671 {
672 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 672 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
673 { 673 {
examples/metaball-refrac/metaball-refrac-example.cpp
  View file @e3080a8
@@ -759,7 +759,7 @@ bool MetaballRefracController::OnTouch( Actor actor, const TouchEvent&amp; touch ) @@ -759,7 +759,7 @@ bool MetaballRefracController::OnTouch( Actor actor, const TouchEvent&amp; touch )
759 759
760 void MetaballRefracController::OnKeyEvent(const KeyEvent& event) 760 void MetaballRefracController::OnKeyEvent(const KeyEvent& event)
761 { 761 {
762 - if( event.GetState() == KeyEvent::Down ) 762 + if( event.GetState() == KeyEvent::DOWN )
763 { 763 {
764 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 764 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
765 { 765 {
examples/model3d-view/model3d-view-example.cpp
  View file @e3080a8
@@ -262,7 +262,7 @@ public: @@ -262,7 +262,7 @@ public:
262 */ 262 */
263 void OnKeyEvent(const KeyEvent& event) 263 void OnKeyEvent(const KeyEvent& event)
264 { 264 {
265 - if(event.GetState() == KeyEvent::Down) 265 + if(event.GetState() == KeyEvent::DOWN)
266 { 266 {
267 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 267 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
268 { 268 {
examples/motion-blur/motion-blur-example.cpp
  View file @e3080a8
@@ -400,7 +400,7 @@ public: @@ -400,7 +400,7 @@ public:
400 */ 400 */
401 void OnKeyEvent(const KeyEvent& event) 401 void OnKeyEvent(const KeyEvent& event)
402 { 402 {
403 - if(event.GetState() == KeyEvent::Down) 403 + if(event.GetState() == KeyEvent::DOWN)
404 { 404 {
405 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 405 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
406 { 406 {
examples/motion-stretch/motion-stretch-example.cpp
  View file @e3080a8
@@ -372,7 +372,7 @@ public: @@ -372,7 +372,7 @@ public:
372 */ 372 */
373 void OnKeyEvent(const KeyEvent& event) 373 void OnKeyEvent(const KeyEvent& event)
374 { 374 {
375 - if(event.GetState() == KeyEvent::Down) 375 + if(event.GetState() == KeyEvent::DOWN)
376 { 376 {
377 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 377 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
378 { 378 {
examples/native-image-source/native-image-source-example.cpp
  View file @e3080a8
@@ -384,7 +384,7 @@ public: @@ -384,7 +384,7 @@ public:
384 384
385 void OnKeyEvent(const KeyEvent& event) 385 void OnKeyEvent(const KeyEvent& event)
386 { 386 {
387 - if(event.GetState() == KeyEvent::Down) 387 + if(event.GetState() == KeyEvent::DOWN)
388 { 388 {
389 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 389 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
390 { 390 {
examples/page-turn-view/page-turn-view-example.cpp
  View file @e3080a8
@@ -267,7 +267,7 @@ void PageTurnExample::Rotate( DemoOrientation orientation ) @@ -267,7 +267,7 @@ void PageTurnExample::Rotate( DemoOrientation orientation )
267 */ 267 */
268 void PageTurnExample::OnKeyEvent(const KeyEvent& event) 268 void PageTurnExample::OnKeyEvent(const KeyEvent& event)
269 { 269 {
270 - if(event.GetState() == KeyEvent::Down) 270 + if(event.GetState() == KeyEvent::DOWN)
271 { 271 {
272 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 272 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
273 { 273 {
examples/perf-scroll/perf-scroll.cpp
  View file @e3080a8
@@ -445,7 +445,7 @@ public: @@ -445,7 +445,7 @@ public:
445 445
446 void OnKeyEvent( const KeyEvent& event ) 446 void OnKeyEvent( const KeyEvent& event )
447 { 447 {
448 - if( event.GetState() == KeyEvent::Down ) 448 + if( event.GetState() == KeyEvent::DOWN )
449 { 449 {
450 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 450 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
451 { 451 {
examples/pivot/pivot-example.cpp
  View file @e3080a8
@@ -136,7 +136,7 @@ private: @@ -136,7 +136,7 @@ private:
136 */ 136 */
137 void OnKeyEvent( const KeyEvent& event ) 137 void OnKeyEvent( const KeyEvent& event )
138 { 138 {
139 - if( event.GetState() == KeyEvent::Down ) 139 + if( event.GetState() == KeyEvent::DOWN )
140 { 140 {
141 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 141 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
142 { 142 {
examples/point-mesh/point-mesh-example.cpp
  View file @e3080a8
@@ -203,7 +203,7 @@ public: @@ -203,7 +203,7 @@ public:
203 203
204 void OnKeyEvent(const KeyEvent& event) 204 void OnKeyEvent(const KeyEvent& event)
205 { 205 {
206 - if(event.GetState() == KeyEvent::Down) 206 + if(event.GetState() == KeyEvent::DOWN)
207 { 207 {
208 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 208 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
209 { 209 {
examples/popup/popup-example.cpp
  View file @e3080a8
@@ -671,7 +671,7 @@ public: @@ -671,7 +671,7 @@ public:
671 671
672 void OnKeyEvent( const KeyEvent& event ) 672 void OnKeyEvent( const KeyEvent& event )
673 { 673 {
674 - if( event.GetState() == KeyEvent::Down ) 674 + if( event.GetState() == KeyEvent::DOWN )
675 { 675 {
676 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 676 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
677 { 677 {
examples/pre-render-callback/pre-render-callback-example.cpp
  View file @e3080a8
@@ -187,7 +187,7 @@ private: @@ -187,7 +187,7 @@ private:
187 */ 187 */
188 void OnKeyEvent( const KeyEvent& event ) 188 void OnKeyEvent( const KeyEvent& event )
189 { 189 {
190 - if( event.GetState() == KeyEvent::Down ) 190 + if( event.GetState() == KeyEvent::DOWN )
191 { 191 {
192 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 192 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
193 { 193 {
examples/primitive-shapes/primitive-shapes-example.cpp
  View file @e3080a8
@@ -676,7 +676,7 @@ public: @@ -676,7 +676,7 @@ public:
676 //If escape or the back button is pressed, quit the application (and return to the launcher) 676 //If escape or the back button is pressed, quit the application (and return to the launcher)
677 void OnKeyEvent( const KeyEvent& event ) 677 void OnKeyEvent( const KeyEvent& event )
678 { 678 {
679 - if( event.GetState() == KeyEvent::Down ) 679 + if( event.GetState() == KeyEvent::DOWN )
680 { 680 {
681 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 681 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
682 { 682 {
examples/progress-bar/progress-bar-example.cpp
  View file @e3080a8
@@ -234,7 +234,7 @@ private: @@ -234,7 +234,7 @@ private:
234 } 234 }
235 void OnKeyEvent( const KeyEvent& event ) 235 void OnKeyEvent( const KeyEvent& event )
236 { 236 {
237 - if( event.GetState() == KeyEvent::Down ) 237 + if( event.GetState() == KeyEvent::DOWN )
238 { 238 {
239 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 239 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
240 { 240 {
examples/property-notification/property-notification-example.cpp
  View file @e3080a8
@@ -88,7 +88,7 @@ public: @@ -88,7 +88,7 @@ public:
88 */ 88 */
89 void OnKeyEvent( const KeyEvent& event ) 89 void OnKeyEvent( const KeyEvent& event )
90 { 90 {
91 - if( event.GetState() == KeyEvent::Down ) 91 + if( event.GetState() == KeyEvent::DOWN )
92 { 92 {
93 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 93 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
94 { 94 {
examples/ray-marching/ray-marching-example.cpp
  View file @e3080a8
@@ -149,7 +149,7 @@ public: @@ -149,7 +149,7 @@ public:
149 */ 149 */
150 void OnKeyEvent(const KeyEvent& event) 150 void OnKeyEvent(const KeyEvent& event)
151 { 151 {
152 - if(event.GetState() == KeyEvent::Down) 152 + if(event.GetState() == KeyEvent::DOWN)
153 { 153 {
154 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 154 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
155 { 155 {
examples/reflection-demo/reflection-example.cpp
  View file @e3080a8
@@ -625,7 +625,7 @@ private: @@ -625,7 +625,7 @@ private:
625 625
626 void OnKeyEvent( const KeyEvent& event ) 626 void OnKeyEvent( const KeyEvent& event )
627 { 627 {
628 - if( event.GetState() == KeyEvent::Down ) 628 + if( event.GetState() == KeyEvent::DOWN )
629 { 629 {
630 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 630 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
631 { 631 {
examples/refraction-effect/refraction-effect-example.cpp
  View file @e3080a8
@@ -561,7 +561,7 @@ private: @@ -561,7 +561,7 @@ private:
561 */ 561 */
562 void OnKeyEvent(const KeyEvent& event) 562 void OnKeyEvent(const KeyEvent& event)
563 { 563 {
564 - if(event.GetState() == KeyEvent::Down) 564 + if(event.GetState() == KeyEvent::DOWN)
565 { 565 {
566 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 566 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
567 { 567 {
examples/remote-image-loading/remote-image-loading-example.cpp
  View file @e3080a8
@@ -127,7 +127,7 @@ public: @@ -127,7 +127,7 @@ public:
127 127
128 void OnKeyEvent(const KeyEvent& event) 128 void OnKeyEvent(const KeyEvent& event)
129 { 129 {
130 - if( event.GetState() == KeyEvent::Down ) 130 + if( event.GetState() == KeyEvent::DOWN )
131 { 131 {
132 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 132 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
133 { 133 {
@@ -138,7 +138,7 @@ public: @@ -138,7 +138,7 @@ public:
138 138
139 void OnKey(const KeyEvent &event) 139 void OnKey(const KeyEvent &event)
140 { 140 {
141 - if (event.GetState() == KeyEvent::Down) 141 + if (event.GetState() == KeyEvent::DOWN)
142 { 142 {
143 std::cout<<"Window key : " << event.GetKeyCode() << std::endl; 143 std::cout<<"Window key : " << event.GetKeyCode() << std::endl;
144 } 144 }
@@ -154,7 +154,7 @@ public: @@ -154,7 +154,7 @@ public:
154 154
155 bool OnControlKeyEvent(Toolkit::Control control, const KeyEvent &event) 155 bool OnControlKeyEvent(Toolkit::Control control, const KeyEvent &event)
156 { 156 {
157 - if (event.GetState() == KeyEvent::Down) 157 + if (event.GetState() == KeyEvent::DOWN)
158 { 158 {
159 std::cout<<"Control down key : " << control.GetProperty< std::string >( Dali::Actor::Property::NAME ) << ", keyCode : " << event.GetKeyCode() << std::endl; 159 std::cout<<"Control down key : " << control.GetProperty< std::string >( Dali::Actor::Property::NAME ) << ", keyCode : " << event.GetKeyCode() << std::endl;
160 } 160 }
examples/renderer-stencil/renderer-stencil-example.cpp
  View file @e3080a8
@@ -731,7 +731,7 @@ private: @@ -731,7 +731,7 @@ private:
731 */ 731 */
732 void OnKeyEvent( const KeyEvent& event ) 732 void OnKeyEvent( const KeyEvent& event )
733 { 733 {
734 - if( event.GetState() == KeyEvent::Down ) 734 + if( event.GetState() == KeyEvent::DOWN )
735 { 735 {
736 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 736 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
737 { 737 {
examples/rendering-basic-light/rendering-basic-light-example.cpp
  View file @e3080a8
@@ -237,7 +237,7 @@ public: @@ -237,7 +237,7 @@ public:
237 */ 237 */
238 void OnKeyEvent( const KeyEvent& event ) 238 void OnKeyEvent( const KeyEvent& event )
239 { 239 {
240 - if( event.GetState() == KeyEvent::Down ) 240 + if( event.GetState() == KeyEvent::DOWN )
241 { 241 {
242 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 242 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
243 { 243 {
examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp
  View file @e3080a8
@@ -252,7 +252,7 @@ public: @@ -252,7 +252,7 @@ public:
252 */ 252 */
253 void OnKeyEvent( const KeyEvent& event ) 253 void OnKeyEvent( const KeyEvent& event )
254 { 254 {
255 - if( event.GetState() == KeyEvent::Down ) 255 + if( event.GetState() == KeyEvent::DOWN )
256 { 256 {
257 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 257 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
258 { 258 {
examples/rendering-cube/rendering-cube.cpp
  View file @e3080a8
@@ -120,7 +120,7 @@ public: @@ -120,7 +120,7 @@ public:
120 */ 120 */
121 void OnKeyEvent( const KeyEvent& event ) 121 void OnKeyEvent( const KeyEvent& event )
122 { 122 {
123 - if( event.GetState() == KeyEvent::Down ) 123 + if( event.GetState() == KeyEvent::DOWN )
124 { 124 {
125 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 125 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
126 { 126 {
examples/rendering-line/rendering-line.cpp
  View file @e3080a8
@@ -113,7 +113,7 @@ public: @@ -113,7 +113,7 @@ public:
113 */ 113 */
114 void OnKeyEvent( const KeyEvent& event ) 114 void OnKeyEvent( const KeyEvent& event )
115 { 115 {
116 - if( event.GetState() == KeyEvent::Down ) 116 + if( event.GetState() == KeyEvent::DOWN )
117 { 117 {
118 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 118 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
119 { 119 {
examples/rendering-radial-progress/radial-progress.cpp
  View file @e3080a8
@@ -294,7 +294,7 @@ public: @@ -294,7 +294,7 @@ public:
294 */ 294 */
295 void OnKeyEvent( const KeyEvent& event ) 295 void OnKeyEvent( const KeyEvent& event )
296 { 296 {
297 - if( event.GetState() == KeyEvent::Down ) 297 + if( event.GetState() == KeyEvent::DOWN )
298 { 298 {
299 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 299 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
300 { 300 {
examples/rendering-skybox/rendering-skybox.cpp
  View file @e3080a8
@@ -186,7 +186,7 @@ public: @@ -186,7 +186,7 @@ public:
186 */ 186 */
187 void OnKeyEvent( const KeyEvent& event ) 187 void OnKeyEvent( const KeyEvent& event )
188 { 188 {
189 - if( event.GetState() == KeyEvent::Down ) 189 + if( event.GetState() == KeyEvent::DOWN )
190 { 190 {
191 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 191 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
192 { 192 {
examples/rendering-textured-cube/rendering-textured-cube.cpp
  View file @e3080a8
@@ -126,7 +126,7 @@ public: @@ -126,7 +126,7 @@ public:
126 */ 126 */
127 void OnKeyEvent( const KeyEvent& event ) 127 void OnKeyEvent( const KeyEvent& event )
128 { 128 {
129 - if( event.GetState() == KeyEvent::Down ) 129 + if( event.GetState() == KeyEvent::DOWN )
130 { 130 {
131 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 131 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
132 { 132 {
examples/rendering-triangle/rendering-triangle.cpp
  View file @e3080a8
@@ -113,7 +113,7 @@ public: @@ -113,7 +113,7 @@ public:
113 */ 113 */
114 void OnKeyEvent( const KeyEvent& event ) 114 void OnKeyEvent( const KeyEvent& event )
115 { 115 {
116 - if( event.GetState() == KeyEvent::Down ) 116 + if( event.GetState() == KeyEvent::DOWN )
117 { 117 {
118 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 118 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
119 { 119 {
examples/scroll-view/scroll-view-example.cpp
  View file @e3080a8
@@ -547,7 +547,7 @@ private: @@ -547,7 +547,7 @@ private:
547 */ 547 */
548 void OnKeyEvent(const KeyEvent& event) 548 void OnKeyEvent(const KeyEvent& event)
549 { 549 {
550 - if(event.GetState() == KeyEvent::Down) 550 + if(event.GetState() == KeyEvent::DOWN)
551 { 551 {
552 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 552 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
553 { 553 {
examples/shadows-and-lights/shadows-and-lights-example.cpp
  View file @e3080a8
@@ -413,7 +413,7 @@ public: @@ -413,7 +413,7 @@ public:
413 413
414 void OnKeyEvent(const KeyEvent& event) 414 void OnKeyEvent(const KeyEvent& event)
415 { 415 {
416 - if(event.GetState() == KeyEvent::Down) 416 + if(event.GetState() == KeyEvent::DOWN)
417 { 417 {
418 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 418 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
419 { 419 {
examples/simple-bitmap-font-text-label/simple-text-label-example.cpp
  View file @e3080a8
@@ -172,7 +172,7 @@ public: @@ -172,7 +172,7 @@ public:
172 */ 172 */
173 void OnKeyEvent(const KeyEvent& event) 173 void OnKeyEvent(const KeyEvent& event)
174 { 174 {
175 - if(event.GetState() == KeyEvent::Down) 175 + if(event.GetState() == KeyEvent::DOWN)
176 { 176 {
177 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 177 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
178 { 178 {
examples/simple-scroll-view/simple-scroll-view-example.cpp
  View file @e3080a8
@@ -150,7 +150,7 @@ private: @@ -150,7 +150,7 @@ private:
150 */ 150 */
151 void OnKeyEvent(const KeyEvent& event) 151 void OnKeyEvent(const KeyEvent& event)
152 { 152 {
153 - if(event.GetState() == KeyEvent::Down) 153 + if(event.GetState() == KeyEvent::DOWN)
154 { 154 {
155 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 155 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
156 { 156 {
examples/simple-text-field/simple-text-field.cpp
  View file @e3080a8
@@ -74,7 +74,7 @@ public: @@ -74,7 +74,7 @@ public:
74 */ 74 */
75 void OnKeyEvent(const KeyEvent& event) 75 void OnKeyEvent(const KeyEvent& event)
76 { 76 {
77 - if(event.GetState() == KeyEvent::Down) 77 + if(event.GetState() == KeyEvent::DOWN)
78 { 78 {
79 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 79 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
80 { 80 {
examples/simple-text-label/simple-text-label-example.cpp
  View file @e3080a8
@@ -71,7 +71,7 @@ public: @@ -71,7 +71,7 @@ public:
71 */ 71 */
72 void OnKeyEvent(const KeyEvent& event) 72 void OnKeyEvent(const KeyEvent& event)
73 { 73 {
74 - if(event.GetState() == KeyEvent::Down) 74 + if(event.GetState() == KeyEvent::DOWN)
75 { 75 {
76 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 76 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
77 { 77 {
examples/simple-text-renderer/simple-text-renderer-example.cpp
  View file @e3080a8
@@ -327,7 +327,7 @@ public: @@ -327,7 +327,7 @@ public:
327 */ 327 */
328 void OnKeyEvent(const KeyEvent& event) 328 void OnKeyEvent(const KeyEvent& event)
329 { 329 {
330 - if(event.GetState() == KeyEvent::Down) 330 + if(event.GetState() == KeyEvent::DOWN)
331 { 331 {
332 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 332 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
333 { 333 {
examples/simple-text-visual/simple-text-visual-example.cpp
  View file @e3080a8
@@ -80,7 +80,7 @@ public: @@ -80,7 +80,7 @@ public:
80 */ 80 */
81 void OnKeyEvent(const KeyEvent& event) 81 void OnKeyEvent(const KeyEvent& event)
82 { 82 {
83 - if(event.GetState() == KeyEvent::Down) 83 + if(event.GetState() == KeyEvent::DOWN)
84 { 84 {
85 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 85 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
86 { 86 {
examples/simple-visuals-control/simple-visuals-application.cpp
  View file @e3080a8
@@ -77,7 +77,7 @@ void SimpleVisualsApplication::OnKeyEvent( const KeyEvent&amp; keyEvent ) @@ -77,7 +77,7 @@ void SimpleVisualsApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
77 { 77 {
78 static int keyPressed = 0; 78 static int keyPressed = 0;
79 79
80 - if( keyEvent.GetState() == KeyEvent::Down) 80 + if( keyEvent.GetState() == KeyEvent::DOWN)
81 { 81 {
82 if( keyPressed == 0 ) // Is this the first down event? 82 if( keyPressed == 0 ) // Is this the first down event?
83 { 83 {
@@ -93,7 +93,7 @@ void SimpleVisualsApplication::OnKeyEvent( const KeyEvent&amp; keyEvent ) @@ -93,7 +93,7 @@ void SimpleVisualsApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
93 } 93 }
94 keyPressed = 1; 94 keyPressed = 1;
95 } 95 }
96 - else if( keyEvent.GetState() == KeyEvent::Up ) 96 + else if( keyEvent.GetState() == KeyEvent::UP )
97 { 97 {
98 keyPressed = 0; 98 keyPressed = 0;
99 } 99 }
examples/size-negotiation/size-negotiation-example.cpp
  View file @e3080a8
@@ -765,7 +765,7 @@ public: @@ -765,7 +765,7 @@ public:
765 765
766 void OnKeyEvent( const KeyEvent& event ) 766 void OnKeyEvent( const KeyEvent& event )
767 { 767 {
768 - if( event.GetState() == KeyEvent::Down ) 768 + if( event.GetState() == KeyEvent::DOWN )
769 { 769 {
770 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 770 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
771 { 771 {
examples/sparkle/sparkle-effect-example.cpp
  View file @e3080a8
@@ -248,7 +248,7 @@ private: @@ -248,7 +248,7 @@ private:
248 */ 248 */
249 void OnKeyEvent(const KeyEvent& event) 249 void OnKeyEvent(const KeyEvent& event)
250 { 250 {
251 - if(event.GetState() == KeyEvent::Down) 251 + if(event.GetState() == KeyEvent::DOWN)
252 { 252 {
253 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 253 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
254 { 254 {
examples/styling/styling-application.cpp
  View file @e3080a8
@@ -635,7 +635,7 @@ void StylingApplication::OnKeyEvent( const KeyEvent&amp; keyEvent ) @@ -635,7 +635,7 @@ void StylingApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
635 { 635 {
636 static int keyPressed = 0; 636 static int keyPressed = 0;
637 637
638 - if( keyEvent.GetState() == KeyEvent::Down) 638 + if( keyEvent.GetState() == KeyEvent::DOWN)
639 { 639 {
640 if( keyPressed == 0 ) // Is this the first down event? 640 if( keyPressed == 0 ) // Is this the first down event?
641 { 641 {
@@ -676,7 +676,7 @@ void StylingApplication::OnKeyEvent( const KeyEvent&amp; keyEvent ) @@ -676,7 +676,7 @@ void StylingApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
676 } 676 }
677 keyPressed = 1; 677 keyPressed = 1;
678 } 678 }
679 - else if( keyEvent.GetState() == KeyEvent::Up ) 679 + else if( keyEvent.GetState() == KeyEvent::UP )
680 { 680 {
681 keyPressed = 0; 681 keyPressed = 0;
682 } 682 }
examples/super-blur-view/super-blur-view-example.cpp
  View file @e3080a8
@@ -91,7 +91,7 @@ private: @@ -91,7 +91,7 @@ private:
91 91
92 void OnKeyEvent( const KeyEvent& event ) 92 void OnKeyEvent( const KeyEvent& event )
93 { 93 {
94 - if ( event.GetState() == KeyEvent::Down ) 94 + if ( event.GetState() == KeyEvent::DOWN )
95 { 95 {
96 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 96 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
97 { 97 {
examples/text-editor/text-editor-example.cpp
  View file @e3080a8
@@ -220,7 +220,7 @@ public: @@ -220,7 +220,7 @@ public:
220 220
221 void OnKeyEvent( const KeyEvent& event ) 221 void OnKeyEvent( const KeyEvent& event )
222 { 222 {
223 - if( event.GetState() == KeyEvent::Down ) 223 + if( event.GetState() == KeyEvent::DOWN )
224 { 224 {
225 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 225 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
226 { 226 {
examples/text-field/text-field-example.cpp
  View file @e3080a8
@@ -185,7 +185,7 @@ public: @@ -185,7 +185,7 @@ public:
185 */ 185 */
186 void OnKeyEvent(const KeyEvent& event) 186 void OnKeyEvent(const KeyEvent& event)
187 { 187 {
188 - if(event.GetState() == KeyEvent::Down) 188 + if(event.GetState() == KeyEvent::DOWN)
189 { 189 {
190 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 190 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
191 { 191 {
examples/text-fonts/text-fonts-example.cpp
  View file @e3080a8
@@ -206,7 +206,7 @@ public: @@ -206,7 +206,7 @@ public:
206 */ 206 */
207 void OnKeyEvent(const KeyEvent& event) 207 void OnKeyEvent(const KeyEvent& event)
208 { 208 {
209 - if(event.GetState() == KeyEvent::Down) 209 + if(event.GetState() == KeyEvent::DOWN)
210 { 210 {
211 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 211 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
212 { 212 {
examples/text-label-emojis/text-label-emojis.cpp
  View file @e3080a8
@@ -116,7 +116,7 @@ public: @@ -116,7 +116,7 @@ public:
116 */ 116 */
117 void OnKeyEvent(const KeyEvent& event) 117 void OnKeyEvent(const KeyEvent& event)
118 { 118 {
119 - if(event.GetState() == KeyEvent::Down) 119 + if(event.GetState() == KeyEvent::DOWN)
120 { 120 {
121 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 121 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
122 { 122 {
examples/text-label-multi-language/text-label-multi-language-example.cpp
  View file @e3080a8
@@ -118,7 +118,7 @@ public: @@ -118,7 +118,7 @@ public:
118 */ 118 */
119 void OnKeyEvent(const KeyEvent& event) 119 void OnKeyEvent(const KeyEvent& event)
120 { 120 {
121 - if(event.GetState() == KeyEvent::Down) 121 + if(event.GetState() == KeyEvent::DOWN)
122 { 122 {
123 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 123 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
124 { 124 {
examples/text-label/text-label-example.cpp
  View file @e3080a8
@@ -619,7 +619,7 @@ public: @@ -619,7 +619,7 @@ public:
619 */ 619 */
620 void OnKeyEvent(const KeyEvent& event) 620 void OnKeyEvent(const KeyEvent& event)
621 { 621 {
622 - if(event.GetState() == KeyEvent::Down) 622 + if(event.GetState() == KeyEvent::DOWN)
623 { 623 {
624 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 624 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
625 { 625 {
examples/text-memory-profiling/text-memory-profiling-example.cpp
  View file @e3080a8
@@ -329,7 +329,7 @@ public: @@ -329,7 +329,7 @@ public:
329 */ 329 */
330 void OnKeyEvent( const KeyEvent& event ) 330 void OnKeyEvent( const KeyEvent& event )
331 { 331 {
332 - if( event.GetState() == KeyEvent::Down ) 332 + if( event.GetState() == KeyEvent::DOWN )
333 { 333 {
334 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 334 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
335 { 335 {
examples/text-overlap/text-overlap-example.cpp
  View file @e3080a8
@@ -120,7 +120,7 @@ bool TextOverlapController::OnClicked( Button button ) @@ -120,7 +120,7 @@ bool TextOverlapController::OnClicked( Button button )
120 120
121 void TextOverlapController::OnKeyEvent( const KeyEvent& keyEvent ) 121 void TextOverlapController::OnKeyEvent( const KeyEvent& keyEvent )
122 { 122 {
123 - if( keyEvent.GetState() == KeyEvent::Down && 123 + if( keyEvent.GetState() == KeyEvent::DOWN &&
124 ( IsKey( keyEvent, DALI_KEY_BACK ) || 124 ( IsKey( keyEvent, DALI_KEY_BACK ) ||
125 IsKey( keyEvent, DALI_KEY_ESCAPE ) ) ) 125 IsKey( keyEvent, DALI_KEY_ESCAPE ) ) )
126 { 126 {
examples/text-scrolling/text-scrolling-example.cpp
  View file @e3080a8
@@ -354,7 +354,7 @@ public: @@ -354,7 +354,7 @@ public:
354 */ 354 */
355 void OnKeyEvent(const KeyEvent& event) 355 void OnKeyEvent(const KeyEvent& event)
356 { 356 {
357 - if(event.GetState() == KeyEvent::Down) 357 + if(event.GetState() == KeyEvent::DOWN)
358 { 358 {
359 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 359 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
360 { 360 {
examples/textured-mesh/textured-mesh-example.cpp
  View file @e3080a8
@@ -183,7 +183,7 @@ public: @@ -183,7 +183,7 @@ public:
183 183
184 void OnKeyEvent(const KeyEvent& event) 184 void OnKeyEvent(const KeyEvent& event)
185 { 185 {
186 - if(event.GetState() == KeyEvent::Down) 186 + if(event.GetState() == KeyEvent::DOWN)
187 { 187 {
188 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 188 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
189 { 189 {
examples/tilt/tilt-example.cpp
  View file @e3080a8
@@ -97,7 +97,7 @@ public: @@ -97,7 +97,7 @@ public:
97 */ 97 */
98 void OnKeyEvent( const KeyEvent& event ) 98 void OnKeyEvent( const KeyEvent& event )
99 { 99 {
100 - if( event.GetState() == KeyEvent::Down ) 100 + if( event.GetState() == KeyEvent::DOWN )
101 { 101 {
102 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 102 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
103 { 103 {
examples/tooltip/tooltip-example.cpp
  View file @e3080a8
@@ -117,7 +117,7 @@ private: @@ -117,7 +117,7 @@ private:
117 */ 117 */
118 void OnKeyEvent( const KeyEvent& event ) 118 void OnKeyEvent( const KeyEvent& event )
119 { 119 {
120 - if( event.GetState() == KeyEvent::Down ) 120 + if( event.GetState() == KeyEvent::DOWN )
121 { 121 {
122 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 122 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
123 { 123 {
examples/transitions/transition-application.cpp
  View file @e3080a8
@@ -198,7 +198,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent&amp; keyEvent ) @@ -198,7 +198,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
198 { 198 {
199 static int keyPressed = 0; 199 static int keyPressed = 0;
200 200
201 - if( keyEvent.GetState() == KeyEvent::Down) 201 + if( keyEvent.GetState() == KeyEvent::DOWN)
202 { 202 {
203 if( keyPressed == 0 ) // Is this the first down event? 203 if( keyPressed == 0 ) // Is this the first down event?
204 { 204 {
@@ -214,7 +214,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent&amp; keyEvent ) @@ -214,7 +214,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
214 } 214 }
215 keyPressed = 1; 215 keyPressed = 1;
216 } 216 }
217 - else if( keyEvent.GetState() == KeyEvent::Up ) 217 + else if( keyEvent.GetState() == KeyEvent::UP )
218 { 218 {
219 keyPressed = 0; 219 keyPressed = 0;
220 } 220 }
examples/video-view/video-view-example.cpp
  View file @e3080a8
@@ -262,7 +262,7 @@ private: @@ -262,7 +262,7 @@ private:
262 */ 262 */
263 void OnKeyEvent(const KeyEvent& event) 263 void OnKeyEvent(const KeyEvent& event)
264 { 264 {
265 - if(event.GetState() == KeyEvent::Down) 265 + if(event.GetState() == KeyEvent::DOWN)
266 { 266 {
267 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) 267 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
268 { 268 {
examples/visual-fitting-mode/visual-fitting-mode-example.cpp
  View file @e3080a8
@@ -197,7 +197,7 @@ private: @@ -197,7 +197,7 @@ private:
197 */ 197 */
198 void OnKeyEvent( const KeyEvent& event ) 198 void OnKeyEvent( const KeyEvent& event )
199 { 199 {
200 - if( event.GetState() == KeyEvent::Down ) 200 + if( event.GetState() == KeyEvent::DOWN )
201 { 201 {
202 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 202 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
203 { 203 {
examples/visual-transitions/transition-application.cpp
  View file @e3080a8
@@ -324,7 +324,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent&amp; keyEvent ) @@ -324,7 +324,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
324 { 324 {
325 static int keyPressed = 0; 325 static int keyPressed = 0;
326 326
327 - if( keyEvent.GetState() == KeyEvent::Down) 327 + if( keyEvent.GetState() == KeyEvent::DOWN)
328 { 328 {
329 if( keyPressed == 0 ) // Is this the first down event? 329 if( keyPressed == 0 ) // Is this the first down event?
330 { 330 {
@@ -340,7 +340,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent&amp; keyEvent ) @@ -340,7 +340,7 @@ void TransitionApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
340 } 340 }
341 keyPressed = 1; 341 keyPressed = 1;
342 } 342 }
343 - else if( keyEvent.GetState() == KeyEvent::Up ) 343 + else if( keyEvent.GetState() == KeyEvent::UP )
344 { 344 {
345 keyPressed = 0; 345 keyPressed = 0;
346 } 346 }
examples/web-view/web-view-example.cpp
  View file @e3080a8
@@ -114,7 +114,7 @@ public: @@ -114,7 +114,7 @@ public:
114 114
115 void OnKeyEvent( const KeyEvent& event ) 115 void OnKeyEvent( const KeyEvent& event )
116 { 116 {
117 - if( event.GetState() == KeyEvent::Down ) 117 + if( event.GetState() == KeyEvent::DOWN )
118 { 118 {
119 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) 119 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
120 { 120 {
shared/dali-table-view.cpp
  View file @e3080a8
@@ -699,7 +699,7 @@ void DaliTableView::SetupInnerPageCubeEffect() @@ -699,7 +699,7 @@ void DaliTableView::SetupInnerPageCubeEffect()
699 699
700 void DaliTableView::OnKeyEvent( const KeyEvent& event ) 700 void DaliTableView::OnKeyEvent( const KeyEvent& event )
701 { 701 {
702 - if( event.GetState() == KeyEvent::Down ) 702 + if( event.GetState() == KeyEvent::DOWN )
703 { 703 {
704 if ( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) 704 if ( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
705 { 705 {