Peter M. Groen / dali-demo

Commit 31fe26eea3e2d2a1cd7cbef08afdee5befe4242d

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents 581252f4 6d69b523

Merge "KeyEvent class pimpling" into devel/master

Inline Side-by-side
Showing 107 changed files with 141 additions and 141 deletions

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 107 files are displayed.

builder/dali-builder.cpp
  View file @31fe26e
... ... @@ -280,7 +280,7 @@ private:
280 280 // Process Key events to Quit on back-key
281 281 void OnKeyEvent( const KeyEvent& event )
282 282 {
283   - if( event.state == KeyEvent::Down )
  283 + if( event.GetState() == KeyEvent::Down )
284 284 {
285 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 @31fe26e
... ... @@ -131,7 +131,7 @@ private:
131 131  
132 132 void OnKeyEvent(const KeyEvent& event)
133 133 {
134   - if(event.state == KeyEvent::Down)
  134 + if(event.GetState() == KeyEvent::Down)
135 135 {
136 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 @31fe26e
... ... @@ -163,7 +163,7 @@ public:
163 163  
164 164 void OnKeyEvent(const KeyEvent& event)
165 165 {
166   - if( event.state == KeyEvent::Down )
  166 + if( event.GetState() == KeyEvent::Down )
167 167 {
168 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 @31fe26e
... ... @@ -425,7 +425,7 @@ public:
425 425  
426 426 void OnKeyEvent(const KeyEvent& event)
427 427 {
428   - if( event.state == KeyEvent::Down )
  428 + if( event.GetState() == KeyEvent::Down )
429 429 {
430 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 @31fe26e
... ... @@ -291,7 +291,7 @@ private:
291 291 */
292 292 void OnKeyEvent(const KeyEvent& event)
293 293 {
294   - if(event.state == KeyEvent::Down)
  294 + if(event.GetState() == KeyEvent::Down)
295 295 {
296 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 @31fe26e
... ... @@ -445,7 +445,7 @@ public:
445 445 */
446 446 void OnKeyEvent(const KeyEvent& event)
447 447 {
448   - if( event.state == 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 450 mApplication.Quit();
451 451 }
... ...
examples/animated-vector-images/animated-vector-images-example.cpp
  View file @31fe26e
... ... @@ -201,7 +201,7 @@ private:
201 201 */
202 202 void OnKeyEvent( const KeyEvent& event )
203 203 {
204   - if( event.state == KeyEvent::Down )
  204 + if( event.GetState() == KeyEvent::Down )
205 205 {
206 206 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
207 207 {
... ...
examples/arc-visual/arc-visual-example.cpp
  View file @31fe26e
... ... @@ -229,7 +229,7 @@ private:
229 229  
230 230 void OnKeyEvent( const KeyEvent& event )
231 231 {
232   - if( event.state == KeyEvent::Up )
  232 + if( event.GetState() == KeyEvent::Up )
233 233 {
234 234 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
235 235 {
... ...
examples/benchmark/benchmark.cpp
  View file @31fe26e
... ... @@ -451,7 +451,7 @@ public:
451 451  
452 452 void OnKeyEvent( const KeyEvent& event )
453 453 {
454   - if( event.state == KeyEvent::Down )
  454 + if( event.GetState() == KeyEvent::Down )
455 455 {
456 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 @31fe26e
... ... @@ -573,7 +573,7 @@ public:
573 573 void OnKeyEvent(const KeyEvent& event)
574 574 {
575 575  
576   - if( event.state == 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 578 mApplication.Quit();
579 579 }
... ...
examples/blocks/blocks-example.cpp
  View file @31fe26e
... ... @@ -826,7 +826,7 @@ private:
826 826 */
827 827 void OnKeyEvent(const KeyEvent& event)
828 828 {
829   - if(event.state == KeyEvent::Down)
  829 + if(event.GetState() == KeyEvent::Down)
830 830 {
831 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 @31fe26e
... ... @@ -130,7 +130,7 @@ public:
130 130  
131 131 void OnKeyEvent( const KeyEvent& event )
132 132 {
133   - if( event.state == KeyEvent::Down )
  133 + if( event.GetState() == KeyEvent::Down )
134 134 {
135 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 @31fe26e
... ... @@ -270,7 +270,7 @@ private:
270 270 */
271 271 void OnKeyEvent(const KeyEvent& event)
272 272 {
273   - if(event.state == KeyEvent::Down)
  273 + if(event.GetState() == KeyEvent::Down)
274 274 {
275 275 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
276 276 {
... ...
examples/builder/examples.cpp
  View file @31fe26e
... ... @@ -532,7 +532,7 @@ public:
532 532 */
533 533 void OnKeyEvent(const KeyEvent& event)
534 534 {
535   - if(event.state == KeyEvent::Down)
  535 + if(event.GetState() == KeyEvent::Down)
536 536 {
537 537 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
538 538 {
... ...
examples/buttons/buttons-example.cpp
  View file @31fe26e
... ... @@ -359,7 +359,7 @@ class ButtonsController: public ConnectionTracker
359 359  
360 360 void OnKeyEvent( const KeyEvent& event )
361 361 {
362   - if( event.state == KeyEvent::Down )
  362 + if( event.GetState() == KeyEvent::Down )
363 363 {
364 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 @31fe26e
... ... @@ -216,7 +216,7 @@ public:
216 216 */
217 217 void OnKeyEvent( const KeyEvent& event )
218 218 {
219   - if( event.state == KeyEvent::Down )
  219 + if( event.GetState() == KeyEvent::Down )
220 220 {
221 221 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
222 222 {
... ...
examples/clipping/clipping-example.cpp
  View file @31fe26e
... ... @@ -172,7 +172,7 @@ private:
172 172 */
173 173 void OnKeyEvent( const KeyEvent& event )
174 174 {
175   - if( event.state == KeyEvent::Down )
  175 + if( event.GetState() == KeyEvent::Down )
176 176 {
177 177 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
178 178 {
... ...
examples/color-visual/color-visual-example.cpp
  View file @31fe26e
... ... @@ -117,7 +117,7 @@ public:
117 117  
118 118 void OnKeyEvent( const KeyEvent& event )
119 119 {
120   - if( event.state == KeyEvent::Down )
  120 + if( event.GetState() == KeyEvent::Down )
121 121 {
122 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 @31fe26e
... ... @@ -190,7 +190,7 @@ public:
190 190  
191 191 void OnKeyEvent(const KeyEvent& event)
192 192 {
193   - if(event.state == KeyEvent::Down)
  193 + if(event.GetState() == KeyEvent::Down)
194 194 {
195 195 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
196 196 {
... ...
examples/contact-cards/contact-card.cpp
  View file @31fe26e
... ... @@ -327,7 +327,7 @@ void ContactCard::OnAnimationFinished( Animation& animation )
327 327 void ContactCard::OnKeyEvent( const KeyEvent& event )
328 328 {
329 329 if( ( ! mFolded ) && // If we're folded then there's no need to do any more checking
330   - ( event.state == KeyEvent::Down ) )
  330 + ( event.GetState() == KeyEvent::Down ) )
331 331 {
332 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 @31fe26e
... ... @@ -98,7 +98,7 @@ private:
98 98 */
99 99 void OnKeyEvent( const KeyEvent& event )
100 100 {
101   - if( event.state == KeyEvent::Down )
  101 + if( event.GetState() == KeyEvent::Down )
102 102 {
103 103 KeyInputFocusManager keyInputFocusManager = KeyInputFocusManager::Get();
104 104 if( ! keyInputFocusManager.GetCurrentFocusControl() ) // Don't quit if a control has focus
... ...
examples/cube-transition-effect/cube-transition-effect-example.cpp
  View file @31fe26e
... ... @@ -403,7 +403,7 @@ Texture CubeTransitionApp::LoadWindowFillingTexture( const char* filepath )
403 403  
404 404 void CubeTransitionApp::OnKeyEvent(const KeyEvent& event)
405 405 {
406   - if(event.state == KeyEvent::Down)
  406 + if(event.GetState() == KeyEvent::Down)
407 407 {
408 408 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
409 409 {
... ...
examples/deferred-shading/deferred-shading.cpp
  View file @31fe26e
... ... @@ -777,7 +777,7 @@ private:
777 777  
778 778 void OnKeyEvent(const KeyEvent& event)
779 779 {
780   - if(event.state == KeyEvent::Down)
  780 + if(event.GetState() == KeyEvent::Down)
781 781 {
782 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 @31fe26e
... ... @@ -327,7 +327,7 @@ void DissolveEffectApp::StartTransition(Vector2 position, Vector2 displacement)
327 327  
328 328 void DissolveEffectApp::OnKeyEvent(const KeyEvent& event)
329 329 {
330   - if(event.state == KeyEvent::Down)
  330 + if(event.GetState() == KeyEvent::Down)
331 331 {
332 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 @31fe26e
... ... @@ -118,7 +118,7 @@ public:
118 118  
119 119 void OnKeyEvent( const KeyEvent& event )
120 120 {
121   - if( event.state == KeyEvent::Down )
  121 + if( event.GetState() == KeyEvent::Down )
122 122 {
123 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 @31fe26e
... ... @@ -234,7 +234,7 @@ bool EffectsViewApp::ChangeEffectSize( Button button )
234 234  
235 235 void EffectsViewApp::OnKeyEvent(const KeyEvent& event)
236 236 {
237   - if(event.state == KeyEvent::Down)
  237 + if(event.GetState() == KeyEvent::Down)
238 238 {
239 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 @31fe26e
... ... @@ -330,7 +330,7 @@ private:
330 330 */
331 331 void OnKeyEvent(const KeyEvent& event)
332 332 {
333   - if(event.state == KeyEvent::Down)
  333 + if(event.GetState() == KeyEvent::Down)
334 334 {
335 335 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
336 336 {
... ...
examples/focus-integration/focus-integration.cpp
  View file @31fe26e
... ... @@ -175,7 +175,7 @@ private:
175 175 */
176 176 void OnKeyEvent(const KeyEvent& event)
177 177 {
178   - if(event.state == KeyEvent::Down)
  178 + if(event.GetState() == KeyEvent::Down)
179 179 {
180 180 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
181 181 {
... ...
examples/fpp-game/fpp-game-example.cpp
  View file @31fe26e
... ... @@ -114,7 +114,7 @@ public:
114 114 // Handle a quit key event
115 115 void OnKeyEvent(const KeyEvent& event)
116 116 {
117   - if(event.state == KeyEvent::Down)
  117 + if(event.GetState() == KeyEvent::Down)
118 118 {
119 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 @31fe26e
... ... @@ -165,7 +165,7 @@ private:
165 165 */
166 166 void OnKeyEvent( const KeyEvent& event )
167 167 {
168   - if( event.state == KeyEvent::Down )
  168 + if( event.GetState() == KeyEvent::Down )
169 169 {
170 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 @31fe26e
... ... @@ -142,7 +142,7 @@ private:
142 142  
143 143 void OnKeyEvent(const KeyEvent& event)
144 144 {
145   - if(event.state == KeyEvent::Down)
  145 + if(event.GetState() == KeyEvent::Down)
146 146 {
147 147 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
148 148 {
... ...
examples/gestures/gesture-example.cpp
  View file @31fe26e
... ... @@ -456,7 +456,7 @@ private:
456 456 */
457 457 void OnKeyEvent( const KeyEvent& event )
458 458 {
459   - if( event.state == KeyEvent::Down )
  459 + if( event.GetState() == KeyEvent::Down )
460 460 {
461 461 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
462 462 {
... ...
examples/gradients/gradients-example.cpp
  View file @31fe26e
... ... @@ -183,7 +183,7 @@ public:
183 183  
184 184 void OnKeyEvent(const KeyEvent& event)
185 185 {
186   - if(event.state == KeyEvent::Down)
  186 + if(event.GetState() == KeyEvent::Down)
187 187 {
188 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 @31fe26e
... ... @@ -63,7 +63,7 @@ public:
63 63  
64 64 void OnKeyEvent( const KeyEvent& event )
65 65 {
66   - if( event.state == KeyEvent::Down )
  66 + if( event.GetState() == KeyEvent::Down )
67 67 {
68 68 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
69 69 {
... ...
examples/homescreen-benchmark/homescreen-benchmark.cpp
  View file @31fe26e
... ... @@ -446,7 +446,7 @@ public:
446 446  
447 447 void OnKeyEvent( const KeyEvent& event )
448 448 {
449   - if( event.state == KeyEvent::Down )
  449 + if( event.GetState() == KeyEvent::Down )
450 450 {
451 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 @31fe26e
... ... @@ -525,7 +525,7 @@ private:
525 525 */
526 526 void OnKeyEvent(const KeyEvent& event)
527 527 {
528   - if(event.state == KeyEvent::Down)
  528 + if(event.GetState() == KeyEvent::Down)
529 529 {
530 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 @31fe26e
... ... @@ -566,7 +566,7 @@ public:
566 566  
567 567 void OnKeyEvent(const KeyEvent& event)
568 568 {
569   - if( event.state == KeyEvent::Down )
  569 + if( event.GetState() == KeyEvent::Down )
570 570 {
571 571 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
572 572 {
... ... @@ -580,50 +580,50 @@ public:
580 580 mApplication.Quit();
581 581 }
582 582 }
583   - else if ( event.keyPressedName == "Right" )
  583 + else if ( event.GetKeyName() == "Right" )
584 584 {
585 585 mImageWindowScale.x = std::max( 0.05f, std::min( 1.0f, mImageWindowScale.x * 1.1f ) );
586 586 }
587   - else if ( event.keyPressedName == "Left" )
  587 + else if ( event.GetKeyName() == "Left" )
588 588 {
589 589 mImageWindowScale.x = std::max( 0.05f, mImageWindowScale.x * 0.9f );
590 590 }
591   - else if ( event.keyPressedName == "Up" )
  591 + else if ( event.GetKeyName() == "Up" )
592 592 {
593 593 mImageWindowScale.y = std::max( 0.05f, std::min( 1.0f, mImageWindowScale.y * 1.1f ) );
594 594 }
595   - else if ( event.keyPressedName == "Down" )
  595 + else if ( event.GetKeyName() == "Down" )
596 596 {
597 597 mImageWindowScale.y = std::max( 0.05f, mImageWindowScale.y * 0.9f );
598 598 }
599   - else if ( event.keyPressedName == "o" )
  599 + else if ( event.GetKeyName() == "o" )
600 600 {
601 601 mImageWindowScale.x = std::max( 0.05f, mImageWindowScale.x * 0.9f );
602 602 mImageWindowScale.y = std::max( 0.05f, mImageWindowScale.y * 0.9f );
603 603 }
604   - else if ( event.keyPressedName == "p" )
  604 + else if ( event.GetKeyName() == "p" )
605 605 {
606 606 mImageWindowScale.x = std::max( 0.05f, std::min( 1.0f, mImageWindowScale.x * 1.1f ) );
607 607 mImageWindowScale.y = std::max( 0.05f, std::min( 1.0f, mImageWindowScale.y * 1.1f ) );
608 608 }
609   - else if ( event.keyPressedName == "n" )
  609 + else if ( event.GetKeyName() == "n" )
610 610 {
611 611 mCurrentPath = mCurrentPath + 1;
612 612 mCurrentPath = mCurrentPath < NUM_IMAGE_PATHS ? mCurrentPath : 0;
613 613 }
614   - else if ( event.keyPressedName == "b" )
  614 + else if ( event.GetKeyName() == "b" )
615 615 {
616 616 mCurrentPath = mCurrentPath - 1;
617 617 mCurrentPath = mCurrentPath >= 0 ? mCurrentPath : NUM_IMAGE_PATHS - 1;
618 618 }
619 619 // Cycle filter and scaling modes:
620   - else if ( event.keyPressedName == "f" )
  620 + else if ( event.GetKeyName() == "f" )
621 621 {
622 622 mSamplingMode = NextFilterMode( mSamplingMode );
623 623 mSamplingModeButton.SetProperty( Toolkit::Button::Property::LABEL, StringFromFilterMode( mSamplingMode ) );
624 624 }
625 625 // Cycle filter and scaling modes:
626   - else if ( event.keyPressedName == "s" )
  626 + else if ( event.GetKeyName() == "s" )
627 627 {
628 628 mFittingMode = NextScalingMode( mFittingMode );
629 629 mFittingModeButton.SetProperty( Toolkit::Button::Property::LABEL, StringFromScalingMode( mFittingMode ) );
... ...
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @31fe26e
... ... @@ -542,7 +542,7 @@ public:
542 542 */
543 543 void OnKeyEvent(const KeyEvent& event)
544 544 {
545   - if( event.state == KeyEvent::Down )
  545 + if( event.GetState() == KeyEvent::Down )
546 546 {
547 547 if( IsKey( event, Dali::DALI_KEY_ESCAPE )
548 548 || IsKey( event, Dali::DALI_KEY_BACK ) )
... ...
examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp
  View file @31fe26e
... ... @@ -88,7 +88,7 @@ private:
88 88  
89 89 void OnKeyEvent(const KeyEvent& event)
90 90 {
91   - if(event.state == KeyEvent::Down)
  91 + if(event.GetState() == KeyEvent::Down)
92 92 {
93 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 @31fe26e
... ... @@ -213,7 +213,7 @@ private:
213 213  
214 214 void OnKeyEvent(const KeyEvent& event)
215 215 {
216   - if(event.state == KeyEvent::Down)
  216 + if(event.GetState() == KeyEvent::Down)
217 217 {
218 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 @31fe26e
... ... @@ -209,7 +209,7 @@ public:
209 209 */
210 210 void OnKeyEvent(const KeyEvent& event)
211 211 {
212   - if(event.state == KeyEvent::Down)
  212 + if(event.GetState() == KeyEvent::Down)
213 213 {
214 214 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
215 215 {
... ... @@ -217,7 +217,7 @@ public:
217 217 }
218 218 else
219 219 {
220   - const char* keyName = event.keyPressedName.c_str();
  220 + const char* keyName = event.GetKeyName().c_str();
221 221 if( strcmp(keyName, "Left") == 0 )
222 222 {
223 223 if( mScale > MIN_SCALE )
... ...
examples/image-view-url/image-view-url-example.cpp
  View file @31fe26e
... ... @@ -186,7 +186,7 @@ private:
186 186  
187 187 void OnKeyEvent(const KeyEvent& event)
188 188 {
189   - if(event.state == KeyEvent::Down)
  189 + if(event.GetState() == KeyEvent::Down)
190 190 {
191 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 @31fe26e
... ... @@ -260,7 +260,7 @@ private:
260 260 */
261 261 void OnKeyEvent(const KeyEvent& event)
262 262 {
263   - if(event.state == KeyEvent::Down)
  263 + if(event.GetState() == KeyEvent::Down)
264 264 {
265 265 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
266 266 {
... ...
examples/item-view/item-view-example.cpp
  View file @31fe26e
... ... @@ -963,7 +963,7 @@ private:
963 963 */
964 964 void OnKeyEvent(const KeyEvent& event)
965 965 {
966   - if(event.state == KeyEvent::Down)
  966 + if(event.GetState() == KeyEvent::Down)
967 967 {
968 968 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
969 969 {
... ...
examples/line-mesh/line-mesh-example.cpp
  View file @31fe26e
... ... @@ -310,7 +310,7 @@ public:
310 310  
311 311 void OnKeyEvent(const KeyEvent& event)
312 312 {
313   - if(event.state == KeyEvent::Down)
  313 + if(event.GetState() == KeyEvent::Down)
314 314 {
315 315 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
316 316 {
... ...
examples/magnifier/magnifier-example.cpp
  View file @31fe26e
... ... @@ -376,7 +376,7 @@ public:
376 376  
377 377 void OnKeyEvent(const KeyEvent& event)
378 378 {
379   - if(event.state == KeyEvent::Down)
  379 + if(event.GetState() == KeyEvent::Down)
380 380 {
381 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 @31fe26e
... ... @@ -326,7 +326,7 @@ public:
326 326  
327 327 void OnKeyEvent(const KeyEvent& event)
328 328 {
329   - if(event.state == KeyEvent::Down)
  329 + if(event.GetState() == KeyEvent::Down)
330 330 {
331 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 @31fe26e
... ... @@ -572,7 +572,7 @@ public:
572 572 //If escape or the back button is pressed, quit the application (and return to the launcher)
573 573 void OnKeyEvent( const KeyEvent& event )
574 574 {
575   - if( event.state == KeyEvent::Down )
  575 + if( event.GetState() == KeyEvent::Down )
576 576 {
577 577 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
578 578 {
... ...
examples/metaball-explosion/metaball-explosion-example.cpp
  View file @31fe26e
... ... @@ -667,7 +667,7 @@ bool MetaballExplosionController::OnTouch( Actor actor, const TouchEvent&amp; touch
667 667  
668 668 void MetaballExplosionController::OnKeyEvent(const KeyEvent& event)
669 669 {
670   - if(event.state == KeyEvent::Down)
  670 + if(event.GetState() == KeyEvent::Down)
671 671 {
672 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 @31fe26e
... ... @@ -759,7 +759,7 @@ bool MetaballRefracController::OnTouch( Actor actor, const TouchEvent&amp; touch )
759 759  
760 760 void MetaballRefracController::OnKeyEvent(const KeyEvent& event)
761 761 {
762   - if( event.state == KeyEvent::Down )
  762 + if( event.GetState() == KeyEvent::Down )
763 763 {
764 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 @31fe26e
... ... @@ -262,7 +262,7 @@ public:
262 262 */
263 263 void OnKeyEvent(const KeyEvent& event)
264 264 {
265   - if(event.state == KeyEvent::Down)
  265 + if(event.GetState() == KeyEvent::Down)
266 266 {
267 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 @31fe26e
... ... @@ -400,7 +400,7 @@ public:
400 400 */
401 401 void OnKeyEvent(const KeyEvent& event)
402 402 {
403   - if(event.state == KeyEvent::Down)
  403 + if(event.GetState() == KeyEvent::Down)
404 404 {
405 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 @31fe26e
... ... @@ -372,7 +372,7 @@ public:
372 372 */
373 373 void OnKeyEvent(const KeyEvent& event)
374 374 {
375   - if(event.state == KeyEvent::Down)
  375 + if(event.GetState() == KeyEvent::Down)
376 376 {
377 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 @31fe26e
... ... @@ -384,7 +384,7 @@ public:
384 384  
385 385 void OnKeyEvent(const KeyEvent& event)
386 386 {
387   - if(event.state == KeyEvent::Down)
  387 + if(event.GetState() == KeyEvent::Down)
388 388 {
389 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 @31fe26e
... ... @@ -267,7 +267,7 @@ void PageTurnExample::Rotate( DemoOrientation orientation )
267 267 */
268 268 void PageTurnExample::OnKeyEvent(const KeyEvent& event)
269 269 {
270   - if(event.state == KeyEvent::Down)
  270 + if(event.GetState() == KeyEvent::Down)
271 271 {
272 272 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
273 273 {
... ...
examples/perf-scroll/perf-scroll.cpp
  View file @31fe26e
... ... @@ -445,7 +445,7 @@ public:
445 445  
446 446 void OnKeyEvent( const KeyEvent& event )
447 447 {
448   - if( event.state == KeyEvent::Down )
  448 + if( event.GetState() == KeyEvent::Down )
449 449 {
450 450 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
451 451 {
... ...
examples/pivot/pivot-example.cpp
  View file @31fe26e
... ... @@ -136,7 +136,7 @@ private:
136 136 */
137 137 void OnKeyEvent( const KeyEvent& event )
138 138 {
139   - if( event.state == KeyEvent::Down )
  139 + if( event.GetState() == KeyEvent::Down )
140 140 {
141 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 @31fe26e
... ... @@ -203,7 +203,7 @@ public:
203 203  
204 204 void OnKeyEvent(const KeyEvent& event)
205 205 {
206   - if(event.state == KeyEvent::Down)
  206 + if(event.GetState() == KeyEvent::Down)
207 207 {
208 208 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
209 209 {
... ...
examples/popup/popup-example.cpp
  View file @31fe26e
... ... @@ -671,7 +671,7 @@ public:
671 671  
672 672 void OnKeyEvent( const KeyEvent& event )
673 673 {
674   - if( event.state == KeyEvent::Down )
  674 + if( event.GetState() == KeyEvent::Down )
675 675 {
676 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 @31fe26e
... ... @@ -187,21 +187,21 @@ private:
187 187 */
188 188 void OnKeyEvent( const KeyEvent& event )
189 189 {
190   - if( event.state == KeyEvent::Down )
  190 + if( event.GetState() == KeyEvent::Down )
191 191 {
192 192 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
193 193 {
194 194 mApplication.Quit();
195 195 }
196   - else if( event.keyPressedName.compare("1") == 0)
  196 + else if( event.GetKeyName().compare("1") == 0)
197 197 {
198 198 Adaptor::Get().SetPreRenderCallback( MakeCallback( this, &PreRenderCallbackController::OnPreRender ) );
199 199 }
200   - else if( event.keyPressedName.compare("2") == 0)
  200 + else if( event.GetKeyName().compare("2") == 0)
201 201 {
202 202 Adaptor::Get().SetPreRenderCallback( NULL );
203 203 }
204   - else if( event.keyPressedName.compare("3") == 0)
  204 + else if( event.GetKeyName().compare("3") == 0)
205 205 {
206 206 mKeepPreRender = !mKeepPreRender;
207 207 }
... ...
examples/primitive-shapes/primitive-shapes-example.cpp
  View file @31fe26e
... ... @@ -676,7 +676,7 @@ public:
676 676 //If escape or the back button is pressed, quit the application (and return to the launcher)
677 677 void OnKeyEvent( const KeyEvent& event )
678 678 {
679   - if( event.state == KeyEvent::Down )
  679 + if( event.GetState() == KeyEvent::Down )
680 680 {
681 681 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
682 682 {
... ...
examples/progress-bar/progress-bar-example.cpp
  View file @31fe26e
... ... @@ -234,7 +234,7 @@ private:
234 234 }
235 235 void OnKeyEvent( const KeyEvent& event )
236 236 {
237   - if( event.state == KeyEvent::Down )
  237 + if( event.GetState() == KeyEvent::Down )
238 238 {
239 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 @31fe26e
... ... @@ -88,7 +88,7 @@ public:
88 88 */
89 89 void OnKeyEvent( const KeyEvent& event )
90 90 {
91   - if( event.state == KeyEvent::Down )
  91 + if( event.GetState() == KeyEvent::Down )
92 92 {
93 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 @31fe26e
... ... @@ -149,7 +149,7 @@ public:
149 149 */
150 150 void OnKeyEvent(const KeyEvent& event)
151 151 {
152   - if(event.state == KeyEvent::Down)
  152 + if(event.GetState() == KeyEvent::Down)
153 153 {
154 154 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
155 155 {
... ...
examples/reflection-demo/reflection-example.cpp
  View file @31fe26e
... ... @@ -625,7 +625,7 @@ private:
625 625  
626 626 void OnKeyEvent( const KeyEvent& event )
627 627 {
628   - if( event.state == KeyEvent::Down )
  628 + if( event.GetState() == KeyEvent::Down )
629 629 {
630 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 @31fe26e
... ... @@ -561,7 +561,7 @@ private:
561 561 */
562 562 void OnKeyEvent(const KeyEvent& event)
563 563 {
564   - if(event.state == KeyEvent::Down)
  564 + if(event.GetState() == KeyEvent::Down)
565 565 {
566 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 @31fe26e
... ... @@ -127,7 +127,7 @@ public:
127 127  
128 128 void OnKeyEvent(const KeyEvent& event)
129 129 {
130   - if( event.state == KeyEvent::Down )
  130 + if( event.GetState() == KeyEvent::Down )
131 131 {
132 132 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
133 133 {
... ... @@ -138,9 +138,9 @@ public:
138 138  
139 139 void OnKey(const KeyEvent &event)
140 140 {
141   - if (event.state == KeyEvent::Down)
  141 + if (event.GetState() == KeyEvent::Down)
142 142 {
143   - std::cout<<"Window key : " << event.keyCode << std::endl;
  143 + std::cout<<"Window key : " << event.GetKeyCode() << std::endl;
144 144 }
145 145 }
146 146  
... ... @@ -154,13 +154,13 @@ public:
154 154  
155 155 bool OnControlKeyEvent(Toolkit::Control control, const KeyEvent &event)
156 156 {
157   - if (event.state == 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.keyCode << std::endl;
  159 + std::cout<<"Control down key : " << control.GetProperty< std::string >( Dali::Actor::Property::NAME ) << ", keyCode : " << event.GetKeyCode() << std::endl;
160 160 }
161 161 else
162 162 {
163   - std::cout<<"Control up key : " << control.GetProperty< std::string >( Dali::Actor::Property::NAME ) << ", keyCode : " << event.keyCode << std::endl;
  163 + std::cout<<"Control up key : " << control.GetProperty< std::string >( Dali::Actor::Property::NAME ) << ", keyCode : " << event.GetKeyCode() << std::endl;
164 164 }
165 165 return false;
166 166 }
... ...
examples/renderer-stencil/renderer-stencil-example.cpp
  View file @31fe26e
... ... @@ -731,7 +731,7 @@ private:
731 731 */
732 732 void OnKeyEvent( const KeyEvent& event )
733 733 {
734   - if( event.state == KeyEvent::Down )
  734 + if( event.GetState() == KeyEvent::Down )
735 735 {
736 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 @31fe26e
... ... @@ -237,7 +237,7 @@ public:
237 237 */
238 238 void OnKeyEvent( const KeyEvent& event )
239 239 {
240   - if( event.state == KeyEvent::Down )
  240 + if( event.GetState() == KeyEvent::Down )
241 241 {
242 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 @31fe26e
... ... @@ -252,7 +252,7 @@ public:
252 252 */
253 253 void OnKeyEvent( const KeyEvent& event )
254 254 {
255   - if( event.state == KeyEvent::Down )
  255 + if( event.GetState() == KeyEvent::Down )
256 256 {
257 257 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
258 258 {
... ...
examples/rendering-cube/rendering-cube.cpp
  View file @31fe26e
... ... @@ -120,7 +120,7 @@ public:
120 120 */
121 121 void OnKeyEvent( const KeyEvent& event )
122 122 {
123   - if( event.state == KeyEvent::Down )
  123 + if( event.GetState() == KeyEvent::Down )
124 124 {
125 125 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
126 126 {
... ...
examples/rendering-line/rendering-line.cpp
  View file @31fe26e
... ... @@ -113,7 +113,7 @@ public:
113 113 */
114 114 void OnKeyEvent( const KeyEvent& event )
115 115 {
116   - if( event.state == KeyEvent::Down )
  116 + if( event.GetState() == KeyEvent::Down )
117 117 {
118 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 @31fe26e
... ... @@ -294,7 +294,7 @@ public:
294 294 */
295 295 void OnKeyEvent( const KeyEvent& event )
296 296 {
297   - if( event.state == KeyEvent::Down )
  297 + if( event.GetState() == KeyEvent::Down )
298 298 {
299 299 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
300 300 {
... ...
examples/rendering-skybox/rendering-skybox.cpp
  View file @31fe26e
... ... @@ -186,7 +186,7 @@ public:
186 186 */
187 187 void OnKeyEvent( const KeyEvent& event )
188 188 {
189   - if( event.state == KeyEvent::Down )
  189 + if( event.GetState() == KeyEvent::Down )
190 190 {
191 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 @31fe26e
... ... @@ -126,7 +126,7 @@ public:
126 126 */
127 127 void OnKeyEvent( const KeyEvent& event )
128 128 {
129   - if( event.state == KeyEvent::Down )
  129 + if( event.GetState() == KeyEvent::Down )
130 130 {
131 131 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
132 132 {
... ...
examples/rendering-triangle/rendering-triangle.cpp
  View file @31fe26e
... ... @@ -113,7 +113,7 @@ public:
113 113 */
114 114 void OnKeyEvent( const KeyEvent& event )
115 115 {
116   - if( event.state == KeyEvent::Down )
  116 + if( event.GetState() == KeyEvent::Down )
117 117 {
118 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 @31fe26e
... ... @@ -547,7 +547,7 @@ private:
547 547 */
548 548 void OnKeyEvent(const KeyEvent& event)
549 549 {
550   - if(event.state == KeyEvent::Down)
  550 + if(event.GetState() == KeyEvent::Down)
551 551 {
552 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 @31fe26e
... ... @@ -413,7 +413,7 @@ public:
413 413  
414 414 void OnKeyEvent(const KeyEvent& event)
415 415 {
416   - if(event.state == KeyEvent::Down)
  416 + if(event.GetState() == KeyEvent::Down)
417 417 {
418 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 @31fe26e
... ... @@ -172,7 +172,7 @@ public:
172 172 */
173 173 void OnKeyEvent(const KeyEvent& event)
174 174 {
175   - if(event.state == KeyEvent::Down)
  175 + if(event.GetState() == KeyEvent::Down)
176 176 {
177 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 @31fe26e
... ... @@ -150,7 +150,7 @@ private:
150 150 */
151 151 void OnKeyEvent(const KeyEvent& event)
152 152 {
153   - if(event.state == KeyEvent::Down)
  153 + if(event.GetState() == KeyEvent::Down)
154 154 {
155 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 @31fe26e
... ... @@ -74,7 +74,7 @@ public:
74 74 */
75 75 void OnKeyEvent(const KeyEvent& event)
76 76 {
77   - if(event.state == KeyEvent::Down)
  77 + if(event.GetState() == KeyEvent::Down)
78 78 {
79 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 @31fe26e
... ... @@ -71,7 +71,7 @@ public:
71 71 */
72 72 void OnKeyEvent(const KeyEvent& event)
73 73 {
74   - if(event.state == KeyEvent::Down)
  74 + if(event.GetState() == KeyEvent::Down)
75 75 {
76 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 @31fe26e
... ... @@ -327,7 +327,7 @@ public:
327 327 */
328 328 void OnKeyEvent(const KeyEvent& event)
329 329 {
330   - if(event.state == KeyEvent::Down)
  330 + if(event.GetState() == KeyEvent::Down)
331 331 {
332 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 @31fe26e
... ... @@ -80,7 +80,7 @@ public:
80 80 */
81 81 void OnKeyEvent(const KeyEvent& event)
82 82 {
83   - if(event.state == KeyEvent::Down)
  83 + if(event.GetState() == KeyEvent::Down)
84 84 {
85 85 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
86 86 {
... ...
examples/simple-visuals-control/simple-visuals-application.cpp
  View file @31fe26e
... ... @@ -77,23 +77,23 @@ void SimpleVisualsApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
77 77 {
78 78 static int keyPressed = 0;
79 79  
80   - if( keyEvent.state == KeyEvent::Down)
  80 + if( keyEvent.GetState() == KeyEvent::Down)
81 81 {
82 82 if( keyPressed == 0 ) // Is this the first down event?
83 83 {
84   - printf("Key pressed: %s %d\n", keyEvent.keyPressedName.c_str(), keyEvent.keyCode );
  84 + printf("Key pressed: %s %d\n", keyEvent.GetKeyName().c_str(), keyEvent.GetKeyCode() );
85 85  
86 86 if( IsKey( keyEvent, DALI_KEY_ESCAPE) || IsKey( keyEvent, DALI_KEY_BACK ) )
87 87 {
88 88 mApplication.Quit();
89 89 }
90   - else if( keyEvent.keyPressedName.compare("Return") == 0 )
  90 + else if( keyEvent.GetKeyName().compare("Return") == 0 )
91 91 {
92 92 }
93 93 }
94 94 keyPressed = 1;
95 95 }
96   - else if( keyEvent.state == KeyEvent::Up )
  96 + else if( keyEvent.GetState() == KeyEvent::Up )
97 97 {
98 98 keyPressed = 0;
99 99 }
... ...
examples/size-negotiation/size-negotiation-example.cpp
  View file @31fe26e
... ... @@ -765,7 +765,7 @@ public:
765 765  
766 766 void OnKeyEvent( const KeyEvent& event )
767 767 {
768   - if( event.state == KeyEvent::Down )
  768 + if( event.GetState() == KeyEvent::Down )
769 769 {
770 770 if( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
771 771 {
... ...
examples/sparkle/sparkle-effect-example.cpp
  View file @31fe26e
... ... @@ -248,7 +248,7 @@ private:
248 248 */
249 249 void OnKeyEvent(const KeyEvent& event)
250 250 {
251   - if(event.state == KeyEvent::Down)
  251 + if(event.GetState() == KeyEvent::Down)
252 252 {
253 253 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
254 254 {
... ...
examples/styling/styling-application.cpp
  View file @31fe26e
... ... @@ -635,17 +635,17 @@ void StylingApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
635 635 {
636 636 static int keyPressed = 0;
637 637  
638   - if( keyEvent.state == KeyEvent::Down)
  638 + if( keyEvent.GetState() == KeyEvent::Down)
639 639 {
640 640 if( keyPressed == 0 ) // Is this the first down event?
641 641 {
642   - printf("Key pressed: %s %d\n", keyEvent.keyPressedName.c_str(), keyEvent.keyCode );
  642 + printf("Key pressed: %s %d\n", keyEvent.GetKeyName().c_str(), keyEvent.GetKeyCode() );
643 643  
644 644 if( IsKey( keyEvent, DALI_KEY_ESCAPE) || IsKey( keyEvent, DALI_KEY_BACK ) )
645 645 {
646 646 mApplication.Quit();
647 647 }
648   - else if( keyEvent.keyPressedName.compare("Return") == 0 )
  648 + else if( keyEvent.GetKeyName().compare("Return") == 0 )
649 649 {
650 650 mCurrentTheme++;
651 651 mCurrentTheme %= NUMBER_OF_THEMES;
... ... @@ -676,7 +676,7 @@ void StylingApplication::OnKeyEvent( const KeyEvent&amp; keyEvent )
676 676 }
677 677 keyPressed = 1;
678 678 }
679   - else if( keyEvent.state == KeyEvent::Up )
  679 + else if( keyEvent.GetState() == KeyEvent::Up )
680 680 {
681 681 keyPressed = 0;
682 682 }
... ...
examples/super-blur-view/super-blur-view-example.cpp
  View file @31fe26e
... ... @@ -91,7 +91,7 @@ private:
91 91  
92 92 void OnKeyEvent( const KeyEvent& event )
93 93 {
94   - if ( event.state == KeyEvent::Down )
  94 + if ( event.GetState() == KeyEvent::Down )
95 95 {
96 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 @31fe26e
... ... @@ -220,7 +220,7 @@ public:
220 220  
221 221 void OnKeyEvent( const KeyEvent& event )
222 222 {
223   - if( event.state == KeyEvent::Down )
  223 + if( event.GetState() == KeyEvent::Down )
224 224 {
225 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 @31fe26e
... ... @@ -185,7 +185,7 @@ public:
185 185 */
186 186 void OnKeyEvent(const KeyEvent& event)
187 187 {
188   - if(event.state == KeyEvent::Down)
  188 + if(event.GetState() == KeyEvent::Down)
189 189 {
190 190 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
191 191 {
... ...
examples/text-fonts/text-fonts-example.cpp
  View file @31fe26e
... ... @@ -206,7 +206,7 @@ public:
206 206 */
207 207 void OnKeyEvent(const KeyEvent& event)
208 208 {
209   - if(event.state == KeyEvent::Down)
  209 + if(event.GetState() == KeyEvent::Down)
210 210 {
211 211 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
212 212 {
... ...
examples/text-label-emojis/text-label-emojis.cpp
  View file @31fe26e
... ... @@ -116,7 +116,7 @@ public:
116 116 */
117 117 void OnKeyEvent(const KeyEvent& event)
118 118 {
119   - if(event.state == KeyEvent::Down)
  119 + if(event.GetState() == KeyEvent::Down)
120 120 {
121 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 @31fe26e
... ... @@ -118,7 +118,7 @@ public:
118 118 */
119 119 void OnKeyEvent(const KeyEvent& event)
120 120 {
121   - if(event.state == KeyEvent::Down)
  121 + if(event.GetState() == KeyEvent::Down)
122 122 {
123 123 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
124 124 {
... ...
examples/text-label/text-label-example.cpp
  View file @31fe26e
... ... @@ -619,7 +619,7 @@ public:
619 619 */
620 620 void OnKeyEvent(const KeyEvent& event)
621 621 {
622   - if(event.state == KeyEvent::Down)
  622 + if(event.GetState() == KeyEvent::Down)
623 623 {
624 624 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
625 625 {
... ... @@ -627,13 +627,13 @@ public:
627 627 }
628 628 else if( event.IsCtrlModifier() )
629 629 {
630   - switch( event.keyCode )
  630 + switch( event.GetKeyCode() )
631 631 {
632 632 // Select rendering back-end
633 633 case KEY_ZERO: // fall through
634 634 case KEY_ONE:
635 635 {
636   - mLabel.SetProperty( DevelTextLabel::Property::RENDERING_BACKEND, event.keyCode - 10 );
  636 + mLabel.SetProperty( DevelTextLabel::Property::RENDERING_BACKEND, event.GetKeyCode() - 10 );
637 637 break;
638 638 }
639 639 case KEY_A: // Animate text colour
... ...
examples/text-memory-profiling/text-memory-profiling-example.cpp
  View file @31fe26e
... ... @@ -329,7 +329,7 @@ public:
329 329 */
330 330 void OnKeyEvent( const KeyEvent& event )
331 331 {
332   - if( event.state == KeyEvent::Down )
  332 + if( event.GetState() == KeyEvent::Down )
333 333 {
334 334 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
335 335 {
... ...
examples/text-overlap/text-overlap-example.cpp
  View file @31fe26e
... ... @@ -120,7 +120,7 @@ bool TextOverlapController::OnClicked( Button button )
120 120  
121 121 void TextOverlapController::OnKeyEvent( const KeyEvent& keyEvent )
122 122 {
123   - if( keyEvent.state == KeyEvent::Down &&
  123 + if( keyEvent.GetState() == KeyEvent::Down &&
124 124 ( IsKey( keyEvent, DALI_KEY_BACK ) ||
125 125 IsKey( keyEvent, DALI_KEY_ESCAPE ) ) )
126 126 {
... ...
examples/text-scrolling/text-scrolling-example.cpp
  View file @31fe26e
... ... @@ -354,7 +354,7 @@ public:
354 354 */
355 355 void OnKeyEvent(const KeyEvent& event)
356 356 {
357   - if(event.state == KeyEvent::Down)
  357 + if(event.GetState() == KeyEvent::Down)
358 358 {
359 359 if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
360 360 {
... ... @@ -362,7 +362,7 @@ public:
362 362 }
363 363 else
364 364 {
365   - if ( event.keyPressedName == "2" )
  365 + if ( event.GetKeyName() == "2" )
366 366 {
367 367 mAnimation.AnimateTo( Property( mSmallLabel, Actor::Property::SCALE ), Vector3(1.2f, 1.2f, 0.0f), AlphaFunction::BOUNCE, TimePeriod( 1.0f, 1.0f ) );
368 368 mAnimation.AnimateTo( Property( mLargeLabel, Actor::Property::SCALE ), Vector3(1.2f, 1.2f, 0.0f), AlphaFunction::BOUNCE, TimePeriod( 1.0f, 1.0f ) );
... ...
examples/textured-mesh/textured-mesh-example.cpp
  View file @31fe26e
... ... @@ -183,7 +183,7 @@ public:
183 183  
184 184 void OnKeyEvent(const KeyEvent& event)
185 185 {
186   - if(event.state == KeyEvent::Down)
  186 + if(event.GetState() == KeyEvent::Down)
187 187 {
188 188 if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
189 189 {
... ...
examples/tilt/tilt-example.cpp
  View file @31fe26e
... ... @@ -97,7 +97,7 @@ public:
97 97 */
98 98 void OnKeyEvent( const KeyEvent& event )
99 99 {
100   - if( event.state == KeyEvent::Down )
  100 + if( event.GetState() == KeyEvent::Down )
101 101 {
102 102 if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
103 103 {
... ...