Merge "Changes in Javascript plugin to compile under new mesh api" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 30 Jun 2015 10:21:12 +0000 (03:21 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 30 Jun 2015 10:21:12 +0000 (03:21 -0700)
27 files changed:
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/controls/buttons/button-impl.h
dali-toolkit/internal/controls/scrollable/scroll-view/merge.sublime-project [deleted file]
dali-toolkit/internal/controls/scrollable/scroll-view/merge.sublime-workspace [deleted file]
dali-toolkit/internal/controls/scrollable/scroll-view/tizen.sublime-project [deleted file]
dali-toolkit/internal/controls/scrollable/scroll-view/tizen.sublime-workspace [deleted file]
dali-toolkit/internal/controls/table-view/table-view-impl.cpp
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
dali-toolkit/internal/controls/view/view-impl.cpp [deleted file]
dali-toolkit/internal/controls/view/view-impl.h [deleted file]
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
dali-toolkit/internal/text/decorator/text-decorator.cpp
dali-toolkit/internal/text/text-controller-impl.cpp
dali-toolkit/internal/text/text-controller-impl.h
dali-toolkit/internal/text/text-controller.cpp
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/control-impl.h
dali-toolkit/public-api/controls/control.h
dali-toolkit/public-api/controls/view/view.h [deleted file]
dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp
dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h

index 20a5041..79668ff 100644 (file)
@@ -112,7 +112,7 @@ DummyControlImplOverride::~DummyControlImplOverride() { }
 
 
 void DummyControlImplOverride::OnInitialize() { initializeCalled = true; }
-void DummyControlImplOverride::OnActivated() { activatedCalled = true; }
+bool DummyControlImplOverride::OnAccessibilityActivated() { activatedCalled = true; return true; }
 void DummyControlImplOverride::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
 {
   themeChangeCalled = change == StyleChange::THEME_CHANGE;
index ddfdcba..6db3f8b 100644 (file)
@@ -102,7 +102,7 @@ private:
 private: // From Internal::Control
 
   virtual void OnInitialize();
-  virtual void OnActivated();
+  virtual bool OnAccessibilityActivated();
   virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
   virtual void OnPinch(const PinchGesture& pinch);
   virtual void OnPan(const PanGesture& pan);
index f3aa937..daac903 100644 (file)
@@ -922,7 +922,7 @@ int UtcDaliControlImplOnAccessibilityActivatedP(void)
   DALI_TEST_CHECK( handle );
 
   Property::Map attributes;
-  DALI_TEST_EQUALS( false, handle.DoAction("control-activated", attributes), TEST_LOCATION );
+  DALI_TEST_EQUALS( false, handle.DoAction("accessibility-activated", attributes), TEST_LOCATION );
 
   END_TEST;
 }
index e902ec0..95a6eb5 100644 (file)
@@ -594,7 +594,7 @@ int UtcDaliKeyboardFocusManagerSignalFocusedActorActivated(void)
 
   bool focusedActorActivatedSignalVerified = false;
   FocusedActorActivatedCallback focusedActorActivatedCallback(focusedActorActivatedSignalVerified);
-  manager.FocusedActorActivatedSignal().Connect( &focusedActorActivatedCallback, &FocusedActorActivatedCallback::Callback );
+  manager.FocusedActorEnterKeySignal().Connect( &focusedActorActivatedCallback, &FocusedActorActivatedCallback::Callback );
 
   Integration::KeyEvent returnEvent("Return", "", 0, 0, 0, Integration::KeyEvent::Up);
 
index b2428d9..e37e319 100644 (file)
@@ -485,7 +485,7 @@ private:
   bool DoMoveFocus(FocusIDIter focusIDIter, bool forward, bool wrapped);
 
   /**
-   * Activate the actor. If the actor is control, call OnActivated virtual function.
+   * Activate the actor. If the actor is control, call OnAccessibilityActivated virtual function.
    * This function will emit FocusedActorActivatedSignal.
    * @param actor The actor to activate
    */
index 2877ed3..a1eb3cf 100644 (file)
@@ -905,7 +905,7 @@ Actor& Button::GetDisabledBackgroundImage()
   return mDisabledBackgroundContent;
 }
 
-  bool Button::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes )
+bool Button::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes )
 {
   bool ret = false;
 
@@ -917,14 +917,13 @@ Actor& Button::GetDisabledBackgroundImage()
 
   if( 0 == strcmp( actionName.c_str(), ACTION_BUTTON_CLICK ) )
   {
-    GetImplementation( button ).DoClickAction( attributes );
-    ret = true;
+    ret = GetImplementation( button ).DoClickAction( attributes );
   }
 
   return ret;
 }
 
-  void Button::DoClickAction( const Property::Map& attributes )
+bool Button::DoClickAction( const Property::Map& attributes )
 {
   // Prevents the button signals from doing a recursive loop by sending an action
   // and re-emitting the signals.
@@ -935,7 +934,11 @@ Actor& Button::GetDisabledBackgroundImage()
     mState = ButtonDown;
     OnButtonUp();
     mClickActionPerforming = false;
+
+    return true;
   }
+
+  return false;
 }
 
 void Button::UpdatePaintTransitionState()
@@ -1206,11 +1209,18 @@ void Button::OnInitialize()
   self.SetKeyboardFocusable( true );
 }
 
-void Button::OnActivated()
+bool Button::OnAccessibilityActivated()
+{
+  return OnKeyboardEnter();
+}
+
+bool Button::OnKeyboardEnter()
 {
-  // When the button is activated, it performs the click action
+  // When the enter key is pressed, or button is activated, the click action is performed.
   Property::Map attributes;
-  DoClickAction( attributes );
+  bool ret = DoClickAction( attributes );
+
+  return ret;
 }
 
 void Button::OnControlStageDisconnection()
index 02b1360..e4d49d7 100644 (file)
@@ -279,8 +279,9 @@ private:
   /**
    * Perform the click action to click the button.
    * @param[in] attributes The attributes to perfrom this action.
+   * @return true if this control can perform action.
    */
-  void DoClickAction( const Property::Map& attributes );
+  bool DoClickAction( const Property::Map& attributes );
 
   /**
    * This method is called after the button initialization.
@@ -454,9 +455,14 @@ private: // From Control
   virtual void OnInitialize();
 
   /**
-   * @copydoc Toolkit::Control::OnActivated()
+   * @copydoc Toolkit::Control::OnAccessibilityActivated()
    */
-  virtual void OnActivated();
+  virtual bool OnAccessibilityActivated();
+
+  /**
+   * @copydoc Toolkit::Control::OnKeyboardEnter()
+   */
+  virtual bool OnKeyboardEnter();
 
   /**
    * Callback received when the button is disconnected from the stage.
diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/merge.sublime-project b/dali-toolkit/internal/controls/scrollable/scroll-view/merge.sublime-project
deleted file mode 100644 (file)
index d4bef92..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-       "folders":
-       [
-               {
-                       "path": "/homeSERILOCALr.underhill/dev/new"
-               }
-       ]
-}
diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/merge.sublime-workspace b/dali-toolkit/internal/controls/scrollable/scroll-view/merge.sublime-workspace
deleted file mode 100644 (file)
index ed39525..0000000
+++ /dev/null
@@ -1,1282 +0,0 @@
-{
-       "auto_complete":
-       {
-               "selected_items":
-               [
-                       [
-                               "Set",
-                               "SetBlendMode"
-                       ],
-                       [
-                               "STYLE_",
-                               "STYLE_DROP_SHADOW"
-                       ],
-                       [
-                               "nom",
-                               "normIndices"
-                       ],
-                       [
-                               "norm",
-                               "normVerts"
-                       ],
-                       [
-                               "nomr",
-                               "normVerts"
-                       ],
-                       [
-                               "shadow",
-                               "shadowOffset"
-                       ],
-                       [
-                               "mesh",
-                               "meshRecord"
-                       ],
-                       [
-                               "Text",
-                               "TextLabel"
-                       ],
-                       [
-                               "FRAGMENT_SHADER_",
-                               "FRAGMENT_SHADER_BGRA"
-                       ],
-                       [
-                               "complete",
-                               "completeCount"
-                       ],
-                       [
-                               "mV",
-                               "mVertices"
-                       ],
-                       [
-                               "print",
-                               "PrintMeshData"
-                       ],
-                       [
-                               "vetex",
-                               "vertexBuffer"
-                       ],
-                       [
-                               "inde",
-                               "indexBuffer"
-                       ],
-                       [
-                               "ind",
-                               "indexCount"
-                       ],
-                       [
-                               "ver",
-                               "vertexBuffer"
-                       ],
-                       [
-                               "quad",
-                               "quadData"
-                       ],
-                       [
-                               "qua",
-                               "quadData"
-                       ],
-                       [
-                               "q",
-                               "quadData"
-                       ],
-                       [
-                               "C",
-                               "Count"
-                       ],
-                       [
-                               "gl",
-                               "gl_FragColor"
-                       ],
-                       [
-                               "mAtlas",
-                               "mAtlasId"
-                       ],
-                       [
-                               "mAtl",
-                               "mAtlasId"
-                       ],
-                       [
-                               "texturedQuad",
-                               "texturedQuadGeometry"
-                       ],
-                       [
-                               "Mesh",
-                               "MeshRecord"
-                       ],
-                       [
-                               "Atlas",
-                               "AtlasGlyphManager"
-                       ],
-                       [
-                               "Property",
-                               "PropertyBuffer"
-                       ],
-                       [
-                               "atlas",
-                               "atlasDescriptor"
-                       ],
-                       [
-                               "op",
-                               "optimizedMesh"
-                       ],
-                       [
-                               "vertex",
-                               "vertexCount"
-                       ],
-                       [
-                               "Atl",
-                               "AtlasSlotDescriptor"
-                       ],
-                       [
-                               "he",
-                               "heightInBlocks"
-                       ],
-                       [
-                               "wid",
-                               "widthInBlocks"
-                       ],
-                       [
-                               "imag",
-                               "imageHeight"
-                       ],
-                       [
-                               "image",
-                               "imageWidth"
-                       ]
-               ]
-       },
-       "buffers":
-       [
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/builder/builder-animations.cpp",
-                       "settings":
-                       {
-                               "buffer_size": 13752,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "scroll-overshoot-indicator-impl.h",
-                       "settings":
-                       {
-                               "buffer_size": 8339,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp",
-                       "settings":
-                       {
-                               "buffer_size": 33180,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-field-impl.h",
-                       "settings":
-                       {
-                               "buffer_size": 6419,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.h",
-                       "settings":
-                       {
-                               "buffer_size": 3898,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp",
-                       "settings":
-                       {
-                               "buffer_size": 16273,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls/control-impl.cpp",
-                       "settings":
-                       {
-                               "buffer_size": 29679,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls/control-impl.h",
-                       "settings":
-                       {
-                               "buffer_size": 21305,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls/control.h",
-                       "settings":
-                       {
-                               "buffer_size": 13810,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/file.list",
-                       "settings":
-                       {
-                               "buffer_size": 14166,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/file.list",
-                       "settings":
-                       {
-                               "buffer_size": 6651,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/view/view-impl.cpp",
-                       "settings":
-                       {
-                               "buffer_size": 9817,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/dali-toolkit.h",
-                       "settings":
-                       {
-                               "buffer_size": 7449,
-                               "line_ending": "Unix"
-                       }
-               },
-               {
-                       "contents": "Searching 483 files for \"controlbehaviour\"\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/alignment/alignment-impl.cpp:\n  549  \n  550  Alignment::Alignment( Toolkit::Alignment::Type horizontal, Toolkit::Alignment::Type vertical )\n  551: : Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),\n  552    mHorizontal( horizontal ),\n  553    mVertical( vertical ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp:\n  127  \n  128  BloomView::BloomView()\n  129:   : Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) )\n  130    , mBlurNumSamples(BLOOM_GAUSSIAN_BLUR_VIEW_DEFAULT_NUM_SAMPLES)\n  131    , mBlurBellCurveWidth(BLOOM_GAUSSIAN_BLUR_VIEW_DEFAULT_BLUR_BELL_CURVE_WIDTH)\n  ...\n  149  BloomView::BloomView( const unsigned int blurNumSamples, const float blurBellCurveWidth, const Pixel::Format renderTargetPixelFormat,\n  150                                      const float downsampleWidthScale, const float downsampleHeightScale)\n  151:   : Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) )\n  152    , mBlurNumSamples(blurNumSamples)\n  153    , mBlurBellCurveWidth(blurBellCurveWidth)\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp:\n   40                                unsigned int maximumNumberOfBubble,\n   41                                const Vector2& bubbleSizeRange )\n   42: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ),\n   43    mMovementArea( movementArea ),\n   44    mShapeImage( shapeImage ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp.orig:\n   40                                unsigned int maximumNumberOfBubble,\n   41                                const Vector2& bubbleSizeRange )\n   42: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ),\n   43    mMovementArea( movementArea ),\n   44    mShapeImage( shapeImage ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/buttons/button-impl.cpp:\n  101  \n  102  Button::Button()\n  103: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),\n  104    mAutoRepeatingTimer(),\n  105    mDisabled( false ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp:\n  113  \n  114  EffectsView::EffectsView()\n  115: : Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),\n  116    mEffectType( Toolkit::EffectsView::INVALID_TYPE ),\n  117    mPixelFormat( EFFECTS_VIEW_DEFAULT_PIXEL_FORMAT ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp:\n  117  \n  118  GaussianBlurView::GaussianBlurView()\n  119:   : Control( ControlBehaviour( DISABLE_SIZE_NEGOTIATION ) )\n  120    , mNumSamples(GAUSSIAN_BLUR_VIEW_DEFAULT_NUM_SAMPLES)\n  121    , mBlurBellCurveWidth( 0.001f )\n  ...\n  139                                      const float downsampleWidthScale, const float downsampleHeightScale,\n  140                                      bool blurUserImage)\n  141:   : Control( ControlBehaviour( DISABLE_SIZE_NEGOTIATION ) )\n  142    , mNumSamples(numSamples)\n  143    , mBlurBellCurveWidth( 0.001f )\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/image-view/masked-image-view-impl.cpp:\n  476  \n  477  MaskedImageView::MaskedImageView()\n  478: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),\n  479    mEditMode( Dali::Toolkit::MaskedImageView::EDIT_DISABLED ),\n  480    mSelfPropertySetting( false ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp:\n  124  \n  125  Magnifier::Magnifier()\n  126: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ),\n  127    mPropertySourcePosition(Property::INVALID_INDEX),\n  128    mDefaultCameraDistance(1000.f),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp:\n   61  \n   62  NavigationControl::NavigationControl()\n   63: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ),\n   64    mToolBar(NULL),\n   65    mTitleBar(NULL),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp:\n   48  \n   49  Page::Page()\n   50: : Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),\n   51    mTitle(\"\"),\n   52    mSubTitle(\"\")\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp:\n  260  \n  261  PageTurnView::PageTurnView( PageFactory& pageFactory, const Vector2& pageSize )\n  262: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ),\n  263    mPageFactory( pageFactory ),\n  264    mPageSize( pageSize ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/popup/popup-impl.cpp:\n  105  \n  106  Popup::Popup(PopupStyle& style)\n  107: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),\n  108    mShowing(false),\n  109    mState(Toolkit::Popup::POPUP_NONE), // Initially, the popup state should not be set, it's set in OnInitialize\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp:\n  293  \n  294  ItemView::ItemView(ItemFactory& factory)\n  295: : Scrollable( ControlBehaviour( DISABLE_SIZE_NEGOTIATION | REQUIRES_MOUSE_WHEEL_EVENTS | REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) ),\n  296    mItemFactory(factory),\n  297    mActiveLayout(NULL),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp:\n   41  }\n   42  \n   43: ScrollBase::ScrollBase( ControlBehaviour behaviourFlags )\n   44  : Scrollable( behaviourFlags ),\n   45    mParent(NULL),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h:\n  197     * @param[in] behaviourFlags Flags to enable\n  198     */\n  199:   ScrollBase( ControlBehaviour behaviourFlags );\n  200  \n  201  protected:\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp:\n  535  \n  536  ScrollView::ScrollView()\n  537: : ScrollBase( ControlBehaviour( REQUIRES_MOUSE_WHEEL_EVENTS ) ),   // Enable size negotiation\n  538    mTouchDownTime(0u),\n  539    mGestureStackDepth(0),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp:\n   76  // we dont want size negotiation while scrolling if we can avoid it\n   77  Scrollable::Scrollable()\n   78: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS | DISABLE_SIZE_NEGOTIATION ) ),\n   79    mOvershootEffectColor(  DEFAULT_OVERSHOOT_COLOUR ),\n   80    mOvershootAnimationSpeed ( DEFAULT_OVERSHOOT_ANIMATION_SPEED ),\n   ..\n   83  }\n   84  \n   85: Scrollable::Scrollable( ControlBehaviour behaviourFlags )\n   86: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS | behaviourFlags ) ),\n   87    mOvershootEffectColor(  DEFAULT_OVERSHOOT_COLOUR ),\n   88    mOvershootAnimationSpeed ( DEFAULT_OVERSHOOT_ANIMATION_SPEED ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/scrollable/scrollable-impl.h:\n  187     * @param[in] behaviourFlags Flags to enable\n  188     */\n  189:   Scrollable( ControlBehaviour behaviourFlags );\n  190  \n  191    /**\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp:\n  109  \n  110  ShadowView::ShadowView( float downsampleWidthScale, float downsampleHeightScale )\n  111: : Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),\n  112    mChildrenRoot(Actor::New()),\n  113    mCachedShadowColor(DEFAULT_SHADOW_COLOR),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/slider/slider-impl.cpp:\n  148  \n  149  Slider::Slider()\n  150: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),\n  151    mState( NORMAL ),\n  152    mDisableColor( 0.0f, 0.0f, 0.0f, 0.0f ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp:\n  105  \n  106  SuperBlurView::SuperBlurView( unsigned int blurLevels )\n  107: : Control( ControlBehaviour( DISABLE_SIZE_NEGOTIATION ) ),\n  108    mBlurLevels( blurLevels ),\n  109    mBlurStrengthPropertyIndex(Property::INVALID_INDEX),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/table-view/table-view-impl.cpp:\n  941  \n  942  TableView::TableView( unsigned int initialRows, unsigned int initialColumns )\n  943: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),\n  944    mCellData( initialRows, initialColumns ),\n  945    mLayoutingChild( false ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp:\n 1007  \n 1008  TextField::TextField()\n 1009: : Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),\n 1010    mRenderingBackend( DEFAULT_RENDERING_BACKEND ),\n 1011    mExceedPolicy( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP )\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp:\n  488  \n  489  TextLabel::TextLabel()\n  490: : Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),\n  491    mRenderingBackend( DEFAULT_RENDERING_BACKEND )\n  492  {\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp:\n  589  \n  590  TextSelectionPopup::TextSelectionPopup()\n  591: : Control( ControlBehaviour( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ) ),\n  592    mMaxSize ( DEFAULT_POPUP_MAX_SIZE ),\n  593    mVisiblePopUpSize( DEFAULT_POPUP_MAX_SIZE ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp:\n  297  \n  298  ToolBar::ToolBar()\n  299: : Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),\n  300    mLayout(),\n  301    mLeftOffset( 0 ),\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls/control-impl.cpp:\n  196      mCurrentSize(),\n  197      mNaturalSize(),\n  198:     mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),\n  199      mIsKeyboardNavigationSupported( false ),\n  200      mIsKeyboardFocusGroup( false ),\n  ...\n  394    Vector3 mNaturalSize; ///< Stores the size set through the Actor's API. This is size the actor wants to be. Useful when reset to the initial size is needed.\n  395  \n  396:   ControlBehaviour mFlags :CONTROL_BEHAVIOUR_FLAG_COUNT;    ///< Flags passed in from constructor.\n  397    bool mIsKeyboardNavigationSupported :1;  ///< Stores whether keyboard navigation is supported by the control.\n  398    bool mIsKeyboardFocusGroup :1;           ///< Stores whether the control is a focus group.\n  ...\n  415  {\n  416    // Create the implementation, temporarily owned on stack\n  417:   IntrusivePtr<Control> controlImpl = new Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) );\n  418  \n  419    // Pass ownership to handle\n  ...\n  781  }\n  782  \n  783: Control::Control( ControlBehaviour behaviourFlags )\n  784  : CustomActorImpl( static_cast< ActorFlags >( behaviourFlags ) ),\n  785    mImpl(new Impl(*this))\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls/control-impl.cpp.orig:\n  170      mCurrentSize(),\n  171      mNaturalSize(),\n  172:     mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),\n  173      mIsKeyboardNavigationSupported( false ),\n  174      mIsKeyboardFocusGroup( false ),\n  ...\n  368    Vector3 mNaturalSize; ///< Stores the size set through the Actor's API. This is size the actor wants to be. Useful when reset to the initial size is needed.\n  369  \n  370:   ControlBehaviour mFlags :CONTROL_BEHAVIOUR_FLAG_COUNT;    ///< Flags passed in from constructor.\n  371    bool mIsKeyboardNavigationSupported :1;  ///< Stores whether keyboard navigation is supported by the control.\n  372    bool mIsKeyboardFocusGroup :1;           ///< Stores whether the control is a focus group.\n  ...\n  389  {\n  390    // Create the implementation, temporarily owned on stack\n  391:   IntrusivePtr<Control> controlImpl = new Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) );\n  392  \n  393    // Pass ownership to handle\n  ...\n  754  }\n  755  \n  756: Control::Control( ControlBehaviour behaviourFlags )\n  757  : CustomActorImpl( static_cast< ActorFlags >( behaviourFlags ) ),\n  758    mImpl(new Impl(*this))\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls/control-impl.h:\n  357  \n  358    // Flags for the constructor\n  359:   enum ControlBehaviour\n  360    {\n  361      REQUIRES_STYLE_CHANGE_SIGNALS        = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 0 ),     ///< True if needs to monitor style change signals such as theme/font change\n  ...\n  370     * @brief Create a Control.\n  371     *\n  372:    * @param[in] behaviourFlags Behavioural flags from ControlBehaviour enum\n  373     */\n  374:   Control(ControlBehaviour behaviourFlags);\n  375  \n  376    /**\n\n/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.cpp:\n   59  \n   60  ScrollComponentImpl::ScrollComponentImpl()\n   61: : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) )\n   62  {\n   63  }\n\n44 matches across 31 files\n",
-                       "settings":
-                       {
-                               "buffer_size": 13597,
-                               "line_ending": "Unix",
-                               "name": "Find Results",
-                               "scratch": true
-                       }
-               },
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/new/dali-demo/demo/dali-demo.cpp",
-                       "settings":
-                       {
-                               "buffer_size": 3296,
-                               "line_ending": "Unix"
-                       }
-               }
-       ],
-       "build_system": "",
-       "build_system_choices":
-       [
-       ],
-       "build_varint": "",
-       "command_palette":
-       {
-               "height": 375.0,
-               "last_filter": "Package Control: ",
-               "selected_items":
-               [
-                       [
-                               "Package Control: ",
-                               "Package Control: Install Package"
-                       ],
-                       [
-                               "Package Cont",
-                               "Package Control: Install Package"
-                       ]
-               ],
-               "width": 462.0
-       },
-       "console":
-       {
-               "height": 0.0,
-               "history":
-               [
-               ]
-       },
-       "distraction_free":
-       {
-               "menu_visible": true,
-               "show_minimap": false,
-               "show_open_files": false,
-               "show_tabs": false,
-               "side_bar_visible": false,
-               "status_bar_visible": false
-       },
-       "expanded_folders":
-       [
-               "/homeSERILOCALr.underhill/dev/new",
-               "/homeSERILOCALr.underhill/dev/new/dali-demo",
-               "/homeSERILOCALr.underhill/dev/new/dali-demo/demo",
-               "/homeSERILOCALr.underhill/dev/new/dali-demo/examples",
-               "/homeSERILOCALr.underhill/dev/new/dali-demo/examples/atlas",
-               "/homeSERILOCALr.underhill/dev/new/dali-demo/shared",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/builder",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/scrollable",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/scrollable/scroll-view",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-view",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/view",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls"
-       ],
-       "file_history":
-       [
-               "/homeSERILOCALr.underhill/dev/new/dali-demo/shared/view.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/public-api/controls/control-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/builder/builder-animations.cpp",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/file.list",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/builder/builder-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/clash/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/mesh-merge/dali-toolkit/dali-toolkit/internal/builder/builder-animations.cpp",
-               "/homeSERILOCALr.underhill/dev/mesh-merge/dali-core/dali/public-api/animation/alpha-function.cpp",
-               "/homeSERILOCALr.underhill/dev/mesh-merge/dali-core/dali/internal/event/animation/animation-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/mesh-merge/dali-core/automated-tests/src/dali/utc-Dali-AlphaFunction.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/builder/builder-signals.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/public-api/file.list",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/decorator/text-decorator.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/text-view.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/shader-effects/material.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/shader-effects/sampler.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/shader-effects/shader.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/atlas-manager/atlas-manager.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/builder/builder-impl.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/public-api/builder/builder.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/builder/builder-animations.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/atlas-manager/atlas-manager.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h",
-               "/homeSERILOCALr.underhill/dev/apr28/dali-demo/build/tizen/examples/out",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/internal/update/effects/scene-graph-material.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/demo/dali-table-view.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/shared/view.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/builder/builder-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/file.list",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/actors/renderer.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/object/property-buffer.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/geometry/geometry.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/internal/update/geometry/scene-graph-geometry.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/text-label-multi-language/text-label-multi-language-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/text-label/text-label-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/text-label-emojis/text-label-emojis.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/shaders/text-basic-shadow-shader.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/point-mesh/point-mesh-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/internal/update/resources/complete-status-manager.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/internal/update/node-attachments/scene-graph-renderer-attachment.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/internal/event/images/atlas-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/mesh-morph/mesh-morph-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/atlas/atlas-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/text-view/text-view-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/size-negotiation/size-negotiation-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/scroll-view/scroll-view-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/motion-stretch/motion-stretch-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/motion-blur/motion-blur-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/logging/logging-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/item-view/item-view-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/dissolve-effect/dissolve-effect-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/cube-transition-effect/cube-transition-effect-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/cluster/cluster-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/buttons/buttons-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/builder/examples.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/blocks/blocks-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/textured-mesh/textured-mesh-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/docs/generated/html/font_8h_source.html",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/build/tizen/dali-toolkit/Makefile.in",
-               "/homeSERILOCALr.underhill/.config/sublime-text-3/Packages/User/Preferences.sublime-settings",
-               "/homeSERILOCALr.underhill/dev/test/dali-core/dali/public-api/object/any.h",
-               "/homeSERILOCALr.underhill/.config/sublime-text-3/Packages/User/trailing_spaces.sublime-settings",
-               "/homeSERILOCALr.underhill/.config/sublime-text-3/Packages/User/Default (Linux).sublime-keymap",
-               "/homeSERILOCALr.underhill/.config/sublime-text-3/Packages/TrailingSpaces/trailing_spaces.sublime-settings",
-               "/homeSERILOCALr.underhill/.scripts/nmgrab",
-               "/homeSERILOCALr.underhill/dev/test/dali-core/dali/public-api/object/any.cpp",
-               "/homeSERILOCALr.underhill/.ssh/id_rsa.pub",
-               "/homeSERILOCALr.underhill/.config/sublime-text-3/Packages/Package Control/Package Control.sublime-settings"
-       ],
-       "find":
-       {
-               "height": 37.0
-       },
-       "find_in_files":
-       {
-               "height": 95.0,
-               "where_history":
-               [
-                       "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/mesh-merge/",
-                       "/homeSERILOCALr.underhill/dev/mesh-merge/dali-core/dali",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/demo",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-core",
-                       "/homeSERILOCALr.underhill/dev/new_mesh",
-                       "/homeSERILOCALr.underhill/dev/check/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/check/dali-adaptor",
-                       "/homeSERILOCALr.underhill/dev/check/dali-core/dali",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit"
-               ]
-       },
-       "find_state":
-       {
-               "case_sensitive": false,
-               "find_history":
-               [
-                       "controlbehaviour",
-                       "CONTROL_BEHAVIOUR",
-                       "view",
-                       "style_na",
-                       "setsty",
-                       "scrollovershooteffectr",
-                       "EaseOutQuint50",
-                       "alphafunction",
-                       "alphafunctions",
-                       "alphafunction",
-                       "stage.add",
-                       "mrenderable",
-                       "mrenderableactor",
-                       "blend",
-                       "textab",
-                       "invalid write",
-                       "atlas",
-                       "textabstraction",
-                       "text",
-                       "uniformmap",
-                       "setsortmodifier",
-                       "fragment_shader_b",
-                       "mface",
-                       "blendfunc",
-                       "blendingfunc",
-                       "blendingmode",
-                       "blend",
-                       "mface",
-                       "createme",
-                       "createmes",
-                       "remove",
-                       "index",
-                       "createmes",
-                       "texturedq",
-                       "createmes",
-                       "createmeshac",
-                       "createmesh",
-                       "createmes",
-                       "createan",
-                       "createanim",
-                       "CreateAni",
-                       "createani",
-                       "createanimation",
-                       "CreateBouncingEffect",
-                       "createbou",
-                       "setrelayout",
-                       "setresizepolicy",
-                       "SetResizePolicy",
-                       "TextView",
-                       "textview",
-                       "font",
-                       "font_parameters",
-                       "default_font_parameters",
-                       "default_font",
-                       "defaul",
-                       "DEFAULT_FONT_PARAMETERS",
-                       "default_font_parameters",
-                       "default_font_paramters",
-                       "defaultfontparameter",
-                       "filterscript",
-                       "text-view",
-                       "text-label",
-                       "text-view",
-                       "text-view.cpp",
-                       "text-view",
-                       "public-api/controls/text-view/",
-                       "text-view",
-                       "textview",
-                       "textvie",
-                       "text-view",
-                       "fragment",
-                       "optimize",
-                       "optimizemesh",
-                       "mesh"
-               ],
-               "highlight": true,
-               "in_selection": false,
-               "preserve_case": false,
-               "regex": false,
-               "replace_history":
-               [
-                       "TextLabel"
-               ],
-               "reverse": false,
-               "show_context": true,
-               "use_buffer2": true,
-               "whole_word": false,
-               "wrap": true
-       },
-       "groups":
-       [
-               {
-                       "selected": 12,
-                       "sheets":
-                       [
-                               {
-                                       "buffer": 0,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/builder/builder-animations.cpp",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 13752,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               8968,
-                                                               8968
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 3705.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 14,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 1,
-                                       "file": "scroll-overshoot-indicator-impl.h",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 8339,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               7228,
-                                                               7228
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": -0.0,
-                                               "translation.y": 2940.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 13,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 2,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 33180,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               27892,
-                                                               27892
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 11715.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 12,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 3,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-field-impl.h",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 6419,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               5679,
-                                                               5679
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": -0.0,
-                                               "translation.y": 2475.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 11,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 4,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.h",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 3898,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               3179,
-                                                               3179
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": -0.0,
-                                               "translation.y": 1290.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 10,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 5,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 16273,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               15457,
-                                                               15457
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 6390.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 9,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 6,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls/control-impl.cpp",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 29679,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               9233,
-                                                               9233
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 3459.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 3,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 7,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls/control-impl.h",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 21305,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               0,
-                                                               0
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 1440.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 4,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 8,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/controls/control.h",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 13810,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               12233,
-                                                               12233
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 1646.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 5,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 9,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/public-api/file.list",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 14166,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               10429,
-                                                               10429
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/Text/Plain text.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 2490.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 7,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 10,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/file.list",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 6651,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               5037,
-                                                               5037
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/Text/Plain text.tmLanguage",
-                                                       "tab_size": 3,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 495.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 6,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 11,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/view/view-impl.cpp",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 9817,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               8636,
-                                                               8636
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 3915.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 1,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 12,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/dali-toolkit.h",
-                                       "semi_transient": true,
-                                       "settings":
-                                       {
-                                               "buffer_size": 7449,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               0,
-                                                               0
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage"
-                                               },
-                                               "translation.x": -0.0,
-                                               "translation.y": 765.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 0,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 13,
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 13597,
-                                               "regions":
-                                               {
-                                                       "match":
-                                                       {
-                                                               "flags": 112,
-                                                               "regions":
-                                                               [
-                                                                       [
-                                                                               280,
-                                                                               296
-                                                                       ],
-                                                                       [
-                                                                               561,
-                                                                               577
-                                                                       ],
-                                                                       [
-                                                                               1043,
-                                                                               1059
-                                                                       ],
-                                                                       [
-                                                                               1459,
-                                                                               1475
-                                                                       ],
-                                                                       [
-                                                                               1864,
-                                                                               1880
-                                                                       ],
-                                                                       [
-                                                                               2139,
-                                                                               2155
-                                                                       ],
-                                                                       [
-                                                                               2452,
-                                                                               2468
-                                                                       ],
-                                                                       [
-                                                                               2815,
-                                                                               2831
-                                                                       ],
-                                                                       [
-                                                                               3167,
-                                                                               3183
-                                                                       ],
-                                                                       [
-                                                                               3476,
-                                                                               3492
-                                                                       ],
-                                                                       [
-                                                                               3827,
-                                                                               3843
-                                                                       ],
-                                                                       [
-                                                                               4169,
-                                                                               4185
-                                                                       ],
-                                                                       [
-                                                                               4422,
-                                                                               4438
-                                                                       ],
-                                                                       [
-                                                                               4742,
-                                                                               4758
-                                                                       ],
-                                                                       [
-                                                                               5023,
-                                                                               5039
-                                                                       ],
-                                                                       [
-                                                                               5442,
-                                                                               5458
-                                                                       ],
-                                                                       [
-                                                                               5793,
-                                                                               5809
-                                                                       ],
-                                                                       [
-                                                                               6100,
-                                                                               6116
-                                                                       ],
-                                                                       [
-                                                                               6346,
-                                                                               6362
-                                                                       ],
-                                                                       [
-                                                                               6723,
-                                                                               6739
-                                                                       ],
-                                                                       [
-                                                                               7015,
-                                                                               7031
-                                                                       ],
-                                                                       [
-                                                                               7067,
-                                                                               7083
-                                                                       ],
-                                                                       [
-                                                                               7492,
-                                                                               7508
-                                                                       ],
-                                                                       [
-                                                                               7776,
-                                                                               7792
-                                                                       ],
-                                                                       [
-                                                                               8062,
-                                                                               8078
-                                                                       ],
-                                                                       [
-                                                                               8426,
-                                                                               8442
-                                                                       ],
-                                                                       [
-                                                                               8794,
-                                                                               8810
-                                                                       ],
-                                                                       [
-                                                                               9127,
-                                                                               9143
-                                                                       ],
-                                                                       [
-                                                                               9478,
-                                                                               9494
-                                                                       ],
-                                                                       [
-                                                                               9794,
-                                                                               9810
-                                                                       ],
-                                                                       [
-                                                                               9812,
-                                                                               9828
-                                                                       ],
-                                                                       [
-                                                                               10117,
-                                                                               10133
-                                                                       ],
-                                                                       [
-                                                                               10389,
-                                                                               10405
-                                                                       ],
-                                                                       [
-                                                                               10717,
-                                                                               10733
-                                                                       ],
-                                                                       [
-                                                                               11172,
-                                                                               11188
-                                                                       ],
-                                                                       [
-                                                                               11309,
-                                                                               11325
-                                                                       ],
-                                                                       [
-                                                                               11634,
-                                                                               11650
-                                                                       ],
-                                                                       [
-                                                                               11962,
-                                                                               11978
-                                                                       ],
-                                                                       [
-                                                                               12417,
-                                                                               12433
-                                                                       ],
-                                                                       [
-                                                                               12554,
-                                                                               12570
-                                                                       ],
-                                                                       [
-                                                                               12850,
-                                                                               12866
-                                                                       ],
-                                                                       [
-                                                                               13173,
-                                                                               13189
-                                                                       ],
-                                                                       [
-                                                                               13225,
-                                                                               13241
-                                                                       ],
-                                                                       [
-                                                                               13475,
-                                                                               13491
-                                                                       ]
-                                                               ],
-                                                               "scope": ""
-                                                       }
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               280,
-                                                               320
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "detect_indentation": false,
-                                                       "line_numbers": false,
-                                                       "output_tag": 1,
-                                                       "result_base_dir": "",
-                                                       "result_file_regex": "^([A-Za-z\\\\/<].*):$",
-                                                       "result_line_regex": "^ +([0-9]+):",
-                                                       "scroll_past_end": true,
-                                                       "syntax": "Packages/Default/Find Results.hidden-tmLanguage"
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 0.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 2,
-                                       "type": "text"
-                               },
-                               {
-                                       "buffer": 14,
-                                       "file": "/homeSERILOCALr.underhill/dev/new/dali-demo/demo/dali-demo.cpp",
-                                       "semi_transient": false,
-                                       "settings":
-                                       {
-                                               "buffer_size": 3296,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               984,
-                                                               984
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": 0.0,
-                                               "translation.y": 0.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 8,
-                                       "type": "text"
-                               }
-                       ]
-               }
-       ],
-       "incremental_find":
-       {
-               "height": 23.0
-       },
-       "input":
-       {
-               "height": 0.0
-       },
-       "layout":
-       {
-               "cells":
-               [
-                       [
-                               0,
-                               0,
-                               1,
-                               1
-                       ]
-               ],
-               "cols":
-               [
-                       0.0,
-                       1.0
-               ],
-               "rows":
-               [
-                       0.0,
-                       1.0
-               ]
-       },
-       "menu_visible": true,
-       "output.find_results":
-       {
-               "height": 0.0
-       },
-       "pinned_build_system": "",
-       "project": "merge.sublime-project",
-       "replace":
-       {
-               "height": 42.0
-       },
-       "save_all_on_build": true,
-       "select_file":
-       {
-               "height": 0.0,
-               "last_filter": "",
-               "selected_items":
-               [
-               ],
-               "width": 0.0
-       },
-       "select_project":
-       {
-               "height": 500.0,
-               "last_filter": "",
-               "selected_items":
-               [
-                       [
-                               "",
-                               "~/dev/newmesh.sublime-project"
-                       ]
-               ],
-               "width": 380.0
-       },
-       "select_symbol":
-       {
-               "height": 0.0,
-               "last_filter": "",
-               "selected_items":
-               [
-               ],
-               "width": 0.0
-       },
-       "selected_group": 0,
-       "settings":
-       {
-       },
-       "show_minimap": true,
-       "show_open_files": false,
-       "show_tabs": true,
-       "side_bar_visible": true,
-       "side_bar_width": 503.0,
-       "status_bar_visible": true,
-       "template_settings":
-       {
-       }
-}
diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/tizen.sublime-project b/dali-toolkit/internal/controls/scrollable/scroll-view/tizen.sublime-project
deleted file mode 100644 (file)
index 79164c3..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-       "folders":
-       [
-               {
-                       "path": "/homeSERILOCALr.underhill/dev/tizen"
-               }
-       ]
-}
diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/tizen.sublime-workspace b/dali-toolkit/internal/controls/scrollable/scroll-view/tizen.sublime-workspace
deleted file mode 100644 (file)
index a7478df..0000000
+++ /dev/null
@@ -1,545 +0,0 @@
-{
-       "auto_complete":
-       {
-               "selected_items":
-               [
-                       [
-                               "Set",
-                               "SetBlendMode"
-                       ],
-                       [
-                               "STYLE_",
-                               "STYLE_DROP_SHADOW"
-                       ],
-                       [
-                               "nom",
-                               "normIndices"
-                       ],
-                       [
-                               "norm",
-                               "normVerts"
-                       ],
-                       [
-                               "nomr",
-                               "normVerts"
-                       ],
-                       [
-                               "shadow",
-                               "shadowOffset"
-                       ],
-                       [
-                               "mesh",
-                               "meshRecord"
-                       ],
-                       [
-                               "Text",
-                               "TextLabel"
-                       ],
-                       [
-                               "FRAGMENT_SHADER_",
-                               "FRAGMENT_SHADER_BGRA"
-                       ],
-                       [
-                               "complete",
-                               "completeCount"
-                       ],
-                       [
-                               "mV",
-                               "mVertices"
-                       ],
-                       [
-                               "print",
-                               "PrintMeshData"
-                       ],
-                       [
-                               "vetex",
-                               "vertexBuffer"
-                       ],
-                       [
-                               "inde",
-                               "indexBuffer"
-                       ],
-                       [
-                               "ind",
-                               "indexCount"
-                       ],
-                       [
-                               "ver",
-                               "vertexBuffer"
-                       ],
-                       [
-                               "quad",
-                               "quadData"
-                       ],
-                       [
-                               "qua",
-                               "quadData"
-                       ],
-                       [
-                               "q",
-                               "quadData"
-                       ],
-                       [
-                               "C",
-                               "Count"
-                       ],
-                       [
-                               "gl",
-                               "gl_FragColor"
-                       ],
-                       [
-                               "mAtlas",
-                               "mAtlasId"
-                       ],
-                       [
-                               "mAtl",
-                               "mAtlasId"
-                       ],
-                       [
-                               "texturedQuad",
-                               "texturedQuadGeometry"
-                       ],
-                       [
-                               "Mesh",
-                               "MeshRecord"
-                       ],
-                       [
-                               "Atlas",
-                               "AtlasGlyphManager"
-                       ],
-                       [
-                               "Property",
-                               "PropertyBuffer"
-                       ],
-                       [
-                               "atlas",
-                               "atlasDescriptor"
-                       ],
-                       [
-                               "op",
-                               "optimizedMesh"
-                       ],
-                       [
-                               "vertex",
-                               "vertexCount"
-                       ],
-                       [
-                               "Atl",
-                               "AtlasSlotDescriptor"
-                       ],
-                       [
-                               "he",
-                               "heightInBlocks"
-                       ],
-                       [
-                               "wid",
-                               "widthInBlocks"
-                       ],
-                       [
-                               "imag",
-                               "imageHeight"
-                       ],
-                       [
-                               "image",
-                               "imageWidth"
-                       ]
-               ]
-       },
-       "buffers":
-       [
-               {
-                       "file": "/homeSERILOCALr.underhill/dev/tizen/dali-toolkit/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h",
-                       "settings":
-                       {
-                               "buffer_size": 8339,
-                               "line_ending": "Unix"
-                       }
-               }
-       ],
-       "build_system": "",
-       "build_system_choices":
-       [
-       ],
-       "build_varint": "",
-       "command_palette":
-       {
-               "height": 375.0,
-               "last_filter": "Package Control: ",
-               "selected_items":
-               [
-                       [
-                               "Package Control: ",
-                               "Package Control: Install Package"
-                       ],
-                       [
-                               "Package Cont",
-                               "Package Control: Install Package"
-                       ]
-               ],
-               "width": 462.0
-       },
-       "console":
-       {
-               "height": 0.0,
-               "history":
-               [
-               ]
-       },
-       "distraction_free":
-       {
-               "menu_visible": true,
-               "show_minimap": false,
-               "show_open_files": false,
-               "show_tabs": false,
-               "side_bar_visible": false,
-               "status_bar_visible": false
-       },
-       "expanded_folders":
-       [
-               "/homeSERILOCALr.underhill/dev/tizen",
-               "/homeSERILOCALr.underhill/dev/tizen/dali-toolkit",
-               "/homeSERILOCALr.underhill/dev/tizen/dali-toolkit/dali-toolkit",
-               "/homeSERILOCALr.underhill/dev/tizen/dali-toolkit/dali-toolkit/internal",
-               "/homeSERILOCALr.underhill/dev/tizen/dali-toolkit/dali-toolkit/internal/controls",
-               "/homeSERILOCALr.underhill/dev/tizen/dali-toolkit/dali-toolkit/internal/controls/scrollable",
-               "/homeSERILOCALr.underhill/dev/tizen/dali-toolkit/dali-toolkit/internal/controls/scrollable/scroll-view"
-       ],
-       "file_history":
-       [
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/builder/builder-animations.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/public-api/controls/control-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/file.list",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h",
-               "/homeSERILOCALr.underhill/dev/new/dali-toolkit/dali-toolkit/internal/builder/builder-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/clash/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/mesh-merge/dali-toolkit/dali-toolkit/internal/builder/builder-animations.cpp",
-               "/homeSERILOCALr.underhill/dev/mesh-merge/dali-core/dali/public-api/animation/alpha-function.cpp",
-               "/homeSERILOCALr.underhill/dev/mesh-merge/dali-core/dali/internal/event/animation/animation-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/mesh-merge/dali-core/automated-tests/src/dali/utc-Dali-AlphaFunction.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/builder/builder-signals.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/public-api/file.list",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/decorator/text-decorator.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/text-view.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/shader-effects/material.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/shader-effects/sampler.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/shader-effects/shader.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/atlas-manager/atlas-manager.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/builder/builder-impl.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/public-api/builder/builder.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/builder/builder-animations.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/atlas-manager/atlas-manager.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h",
-               "/homeSERILOCALr.underhill/dev/apr28/dali-demo/build/tizen/examples/out",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/internal/update/effects/scene-graph-material.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/demo/dali-table-view.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/shared/view.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/builder/builder-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/file.list",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/actors/renderer.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/object/property-buffer.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/public-api/geometry/geometry.h",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/internal/update/geometry/scene-graph-geometry.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/text-label-multi-language/text-label-multi-language-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/text-label/text-label-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/text-label-emojis/text-label-emojis.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/shaders/text-basic-shadow-shader.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/point-mesh/point-mesh-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/internal/update/resources/complete-status-manager.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/internal/update/node-attachments/scene-graph-renderer-attachment.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali/internal/event/images/atlas-impl.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/mesh-morph/mesh-morph-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/atlas/atlas-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/text-view/text-view-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/size-negotiation/size-negotiation-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/scroll-view/scroll-view-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/motion-stretch/motion-stretch-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/motion-blur/motion-blur-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/logging/logging-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/item-view/item-view-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/dissolve-effect/dissolve-effect-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/cube-transition-effect/cube-transition-effect-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/cluster/cluster-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/buttons/buttons-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/builder/examples.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/blocks/blocks-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples/textured-mesh/textured-mesh-example.cpp",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/docs/generated/html/font_8h_source.html",
-               "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/build/tizen/dali-toolkit/Makefile.in",
-               "/homeSERILOCALr.underhill/.config/sublime-text-3/Packages/User/Preferences.sublime-settings",
-               "/homeSERILOCALr.underhill/dev/test/dali-core/dali/public-api/object/any.h",
-               "/homeSERILOCALr.underhill/.config/sublime-text-3/Packages/User/trailing_spaces.sublime-settings",
-               "/homeSERILOCALr.underhill/.config/sublime-text-3/Packages/User/Default (Linux).sublime-keymap",
-               "/homeSERILOCALr.underhill/.config/sublime-text-3/Packages/TrailingSpaces/trailing_spaces.sublime-settings",
-               "/homeSERILOCALr.underhill/.scripts/nmgrab",
-               "/homeSERILOCALr.underhill/dev/test/dali-core/dali/public-api/object/any.cpp",
-               "/homeSERILOCALr.underhill/.ssh/id_rsa.pub",
-               "/homeSERILOCALr.underhill/.config/sublime-text-3/Packages/Package Control/Package Control.sublime-settings"
-       ],
-       "find":
-       {
-               "height": 37.0
-       },
-       "find_in_files":
-       {
-               "height": 95.0,
-               "where_history":
-               [
-                       "/homeSERILOCALr.underhill/dev/mesh-merge/",
-                       "/homeSERILOCALr.underhill/dev/mesh-merge/dali-core/dali",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit/",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/demo",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-demo/examples",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-core",
-                       "/homeSERILOCALr.underhill/dev/new_mesh",
-                       "/homeSERILOCALr.underhill/dev/check/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/check/dali-adaptor",
-                       "/homeSERILOCALr.underhill/dev/check/dali-core/dali",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-core/dali",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/",
-                       "/homeSERILOCALr.underhill/dev/new_mesh/dali-toolkit/dali-toolkit"
-               ]
-       },
-       "find_state":
-       {
-               "case_sensitive": false,
-               "find_history":
-               [
-                       "style_na",
-                       "setsty",
-                       "scrollovershooteffectr",
-                       "EaseOutQuint50",
-                       "alphafunction",
-                       "alphafunctions",
-                       "alphafunction",
-                       "stage.add",
-                       "mrenderable",
-                       "mrenderableactor",
-                       "blend",
-                       "textab",
-                       "invalid write",
-                       "atlas",
-                       "textabstraction",
-                       "text",
-                       "uniformmap",
-                       "setsortmodifier",
-                       "fragment_shader_b",
-                       "mface",
-                       "blendfunc",
-                       "blendingfunc",
-                       "blendingmode",
-                       "blend",
-                       "mface",
-                       "createme",
-                       "createmes",
-                       "remove",
-                       "index",
-                       "createmes",
-                       "texturedq",
-                       "createmes",
-                       "createmeshac",
-                       "createmesh",
-                       "createmes",
-                       "createan",
-                       "createanim",
-                       "CreateAni",
-                       "createani",
-                       "createanimation",
-                       "CreateBouncingEffect",
-                       "createbou",
-                       "setrelayout",
-                       "setresizepolicy",
-                       "SetResizePolicy",
-                       "TextView",
-                       "textview",
-                       "font",
-                       "font_parameters",
-                       "default_font_parameters",
-                       "default_font",
-                       "defaul",
-                       "DEFAULT_FONT_PARAMETERS",
-                       "default_font_parameters",
-                       "default_font_paramters",
-                       "defaultfontparameter",
-                       "filterscript",
-                       "text-view",
-                       "text-label",
-                       "text-view",
-                       "text-view.cpp",
-                       "text-view",
-                       "public-api/controls/text-view/",
-                       "text-view",
-                       "textview",
-                       "textvie",
-                       "text-view",
-                       "fragment",
-                       "optimize",
-                       "optimizemesh",
-                       "mesh"
-               ],
-               "highlight": true,
-               "in_selection": false,
-               "preserve_case": false,
-               "regex": false,
-               "replace_history":
-               [
-                       "TextLabel"
-               ],
-               "reverse": false,
-               "show_context": true,
-               "use_buffer2": true,
-               "whole_word": false,
-               "wrap": true
-       },
-       "groups":
-       [
-               {
-                       "selected": 0,
-                       "sheets":
-                       [
-                               {
-                                       "buffer": 0,
-                                       "file": "/homeSERILOCALr.underhill/dev/tizen/dali-toolkit/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h",
-                                       "semi_transient": true,
-                                       "settings":
-                                       {
-                                               "buffer_size": 8339,
-                                               "regions":
-                                               {
-                                               },
-                                               "selection":
-                                               [
-                                                       [
-                                                               7226,
-                                                               7331
-                                                       ]
-                                               ],
-                                               "settings":
-                                               {
-                                                       "syntax": "Packages/C++/C++.tmLanguage",
-                                                       "tab_size": 2,
-                                                       "translate_tabs_to_spaces": true
-                                               },
-                                               "translation.x": -0.0,
-                                               "translation.y": 3225.0,
-                                               "zoom_level": 1.0
-                                       },
-                                       "stack_index": 0,
-                                       "type": "text"
-                               }
-                       ]
-               }
-       ],
-       "incremental_find":
-       {
-               "height": 23.0
-       },
-       "input":
-       {
-               "height": 0.0
-       },
-       "layout":
-       {
-               "cells":
-               [
-                       [
-                               0,
-                               0,
-                               1,
-                               1
-                       ]
-               ],
-               "cols":
-               [
-                       0.0,
-                       1.0
-               ],
-               "rows":
-               [
-                       0.0,
-                       1.0
-               ]
-       },
-       "menu_visible": true,
-       "output.find_results":
-       {
-               "height": 0.0
-       },
-       "pinned_build_system": "",
-       "project": "tizen.sublime-project",
-       "replace":
-       {
-               "height": 42.0
-       },
-       "save_all_on_build": true,
-       "select_file":
-       {
-               "height": 0.0,
-               "last_filter": "",
-               "selected_items":
-               [
-               ],
-               "width": 0.0
-       },
-       "select_project":
-       {
-               "height": 500.0,
-               "last_filter": "",
-               "selected_items":
-               [
-                       [
-                               "",
-                               "~/dev/new/dali-toolkit/dali-toolkit/internal/controls/scrollable/scroll-view/merge.sublime-project"
-                       ]
-               ],
-               "width": 380.0
-       },
-       "select_symbol":
-       {
-               "height": 0.0,
-               "last_filter": "",
-               "selected_items":
-               [
-               ],
-               "width": 0.0
-       },
-       "selected_group": 0,
-       "settings":
-       {
-       },
-       "show_minimap": true,
-       "show_open_files": false,
-       "show_tabs": true,
-       "side_bar_visible": true,
-       "side_bar_width": 390.0,
-       "status_bar_visible": true,
-       "template_settings":
-       {
-       }
-}
index f355713..0be26cd 100644 (file)
@@ -1059,7 +1059,7 @@ void TableView::OnControlChildRemove( Actor& child )
 }
 
 TableView::TableView( unsigned int initialRows, unsigned int initialColumns )
-: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
+: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ),
   mCellData( initialRows, initialColumns ),
   mLayoutingChild( false ),
   mRowDirty( true ),     // Force recalculation first time
index e0d6435..db7596a 100644 (file)
@@ -768,8 +768,8 @@ TextSelectionPopup::TextSelectionPopup( TextSelectionPopupCallbackInterface* cal
   mPressedColor( DEFAULT_OPTION_ICON_PRESSED ),
   mSelectOptionPriority( 1 ),
   mSelectAllOptionPriority ( 2 ),
-  mCutOptionPriority ( 3 ),
-  mCopyOptionPriority ( 4 ),
+  mCutOptionPriority ( 4 ),
+  mCopyOptionPriority ( 3 ),
   mPasteOptionPriority ( 5 ),
   mClipboardOptionPriority( 6 ),
   mShowIcons( false ),
diff --git a/dali-toolkit/internal/controls/view/view-impl.cpp b/dali-toolkit/internal/controls/view/view-impl.cpp
deleted file mode 100644 (file)
index 280bd24..0000000
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include "view-impl.h"
-
-// EXTERNAL INCLUDES
-#include <cstring> // for strcmp
-#include <dali/public-api/animation/constraints.h>
-#include <dali/public-api/common/stage.h>
-#include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/object/type-registry-helper.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal
-{
-
-namespace
-{
-
-BaseHandle Create()
-{
-  return Toolkit::View::New();
-}
-
-DALI_TYPE_REGISTRATION_BEGIN( Toolkit::View, Toolkit::Control, Create )
-
-//DALI_SIGNAL_REGISTRATION( View, "orientation-animation-start", SIGNAL_ORIENTATION_ANIMATION_START )
-
-DALI_TYPE_REGISTRATION_END()
-
-const float ROTATION_ANIMATION_DURATION = 0.5f;
-
-}
-
-Toolkit::View View::New( bool fullscreen )
-{
-  // Create the implementation, temporarily owned by this handle on stack
-  IntrusivePtr< View > internalView = new View(fullscreen);
-
-  // Pass ownership to CustomActor handle
-  Toolkit::View view( *internalView );
-
-  // Second-phase init of the implementation
-  // This can only be done after the CustomActor connection has been made...
-  internalView->Initialize();
-
-  return view;
-}
-
-Layer View::GetContentLayer( unsigned int index ) const
-{
-  // Returns the layer stored in the layer map.
-  Layer layer;
-
-  LayerConstIt it = mContentLayers.find( index );
-
-  if( it != mContentLayers.end() )
-  {
-    layer = it->second;
-  }
-
-  return layer;
-}
-
-unsigned int View::AddContentLayer( Layer layer )
-{
-  // layer must exist.
-  DALI_ASSERT_ALWAYS( layer );
-
-  unsigned int index = mNextLayerIndex;
-  LayerIt it = FindLayer( layer );
-
-  if( it == mContentLayers.end() )
-  {
-    // Add layer to the custom actor.
-    Self().Add( layer );
-
-    // Store the layer.
-    mContentLayers[mNextLayerIndex] = layer;
-
-    // Increase the index.
-    ++mNextLayerIndex;
-  }
-
-  return index;
-}
-
-void View::RemoveContentLayer( Layer layer )
-{
-  // Check if layer was added in this view.
-  LayerIt it = FindLayer( layer );
-  if( it != mContentLayers.end() )
-  {
-    // Remove layer from custom actor.
-    Self().Remove( layer );
-
-    // Remove layer from layer map.
-    mContentLayers.erase( it );
-  }
-}
-
-Layer View::GetBackgroundLayer() const
-{
-  return mBackgroundLayer;
-}
-
-void View::SetBackground( ImageActor backgroundImage )
-{
-  // Create background layer if doesn't exist.
-
-  if( !mBackgroundLayer )
-  {
-    mBackgroundLayer = Layer::New();
-
-    mBackgroundLayer.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
-    mBackgroundLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-
-    // Add background layer to custom actor.
-    Self().Add( mBackgroundLayer );
-
-    // Drop the background layer
-
-    DALI_ASSERT_ALWAYS( mBackgroundLayer.OnStage() ); // We need to be on-stage to drop the layer
-    mBackgroundLayer.LowerToBottom();
-  }
-  else
-  {
-    // It removes the old background
-    if( 0 < mBackgroundLayer.GetChildCount() )
-    {
-      mBackgroundLayer.Remove( mBackgroundLayer.GetChildAt(0) );
-    }
-  }
-
-  backgroundImage.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
-  backgroundImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-  backgroundImage.SetSizeScalePolicy( SizeScalePolicy::FILL_WITH_ASPECT_RATIO );
-  mBackgroundLayer.Add( backgroundImage );
-
-  RelayoutRequest();
-}
-
-void View::SetOrientationFunction( Degree portrait, Degree landscale, Degree portraitInverse, Degree landscapeInverse )
-{
-  mOrientationFunction[View::PORTRAIT] = portrait.degree;
-  mOrientationFunction[View::LANDSCAPE] = landscale.degree;
-  mOrientationFunction[View::PORTRAIT_INVERSE] = portraitInverse.degree;
-  mOrientationFunction[View::LANDSCAPE_INVERSE] = landscapeInverse.degree;
-}
-
-void View::OrientationChanged( Dali::Orientation orientation )
-{
-  /*
-  Actor self = Self();
-
-  // Nothing to do if orientation doesn't really change.
-  if ( orientation.GetDegrees() == mOrientation || !mAutoRotateEnabled )
-  {
-    return;
-  }
-
-  mOrientation = orientation.GetDegrees();
-
-  // has parent so we expect it to be on stage
-  mRotateAnimation = Animation::New( ROTATION_ANIMATION_DURATION );
-  mRotateAnimation.AnimateTo( Property( self, Actor::Property::ORIENTATION ), Quaternion( Radian( -orientation.GetRadians() ), Vector3::ZAXIS ), AlphaFunctions::EaseOut );
-
-  // Resize the view
-  if( mFullScreen )
-  {
-    const Vector2& stageSize( Stage::GetCurrent().GetSize() );
-    const Vector3& currentSize( self.GetCurrentSize() );
-
-    float minSize = std::min( stageSize.width, stageSize.height );
-    float maxSize = std::max( stageSize.width, stageSize.height );
-
-    Vector3 targetSize;
-    View::Orientation viewOrientation = DegreeToViewOrientation( Degree( orientation.GetDegrees() ) );
-    switch( viewOrientation )
-    {
-      case View::PORTRAIT:          // Fallthrough
-      case View::PORTRAIT_INVERSE:
-        targetSize = Vector3( minSize, maxSize, currentSize.depth );
-        break;
-      case View::LANDSCAPE:         // Fallthrough
-      case View::LANDSCAPE_INVERSE:
-        targetSize = Vector3( maxSize, minSize, currentSize.depth );
-        break;
-      default:
-        DALI_ASSERT_ALWAYS( false );
-    }
-
-    // if we linearly resize from portrait to landscape halfway through the animation
-    // we get size which is square between the both. This would cause a square image to grow
-    // if it is fitted to be 100% of view size. Therefore we do a nonlinear size animation
-    // where we shrink faster
-    // which one grows
-    if( targetSize.width > currentSize.width )
-    {
-      // width grows, shrink height faster
-      Vector3 shrink( currentSize );shrink.height = targetSize.height;
-      mRotateAnimation.AnimateTo( Property( self, Actor::Property::SIZE ), shrink, AlphaFunctions::EaseOut, TimePeriod( 0.0f, ROTATION_ANIMATION_DURATION * 0.5f ) );
-      mRotateAnimation.AnimateTo( Property( self, Actor::Property::SIZE ), targetSize, AlphaFunctions::EaseIn, TimePeriod( 0.0f, ROTATION_ANIMATION_DURATION ) );
-    }
-    else
-    {
-      // height grows, shrink width faster
-      Vector3 shrink( currentSize );shrink.width = targetSize.width;
-      mRotateAnimation.AnimateTo( Property( self, Actor::Property::SIZE ), shrink, AlphaFunctions::EaseOut, TimePeriod( 0.0f, ROTATION_ANIMATION_DURATION * 0.5f ) );
-      mRotateAnimation.AnimateTo( Property( self, Actor::Property::SIZE ), targetSize, AlphaFunctions::EaseIn, TimePeriod( 0.0f, ROTATION_ANIMATION_DURATION ) );
-    }
-  }
-
-  Toolkit::View handle( GetOwner() );
-  mOrientationAnimationStartedSignal.Emit( handle, mRotateAnimation, orientation );
-
-  mRotateAnimation.Play();
-  */
-}
-
-void View::SetAutoRotate( bool enabled )
-{
-  mAutoRotateEnabled = enabled;
-}
-
-Toolkit::View::OrientationAnimationStartedSignalType& View::OrientationAnimationStartedSignal()
-{
-  return mOrientationAnimationStartedSignal;
-}
-
-bool View::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
-{
-  return true;
-
-  /*
-  Dali::BaseHandle handle( object );
-
-  bool connected( true );
-  Toolkit::View view = Toolkit::View::DownCast(handle);
-
-  if( 0 == strcmp( signalName.c_str(), SIGNAL_ORIENTATION_ANIMATION_START ) )
-  {
-    view.OrientationAnimationStartedSignal().Connect( tracker, functor );
-  }
-  else
-  {
-    // signalName does not match any signal
-    connected = false;
-  }
-
-  return connected;
-  */
-}
-
-View::View(bool fullscreen)
-: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),
-  mOrientation( -1 ),
-  mFullScreen(fullscreen),
-  mContentLayers(),
-  mNextLayerIndex( 0 ),
-  mOrientationFunction(),
-  mAutoRotateEnabled( true )
-{
-  mOrientationFunction[View::PORTRAIT] = 0.f;
-  mOrientationFunction[View::LANDSCAPE] = 90.f;
-  mOrientationFunction[View::PORTRAIT_INVERSE] = 180.f;
-  mOrientationFunction[View::LANDSCAPE_INVERSE] =  270.f;
-}
-
-View::~View()
-{
-}
-
-void View::OnInitialize()
-{
-  Self().SetAnchorPoint( AnchorPoint::CENTER );
-  Self().SetParentOrigin( ParentOrigin::CENTER );
-
-  if( mFullScreen )
-  {
-    Self().SetSize( Stage::GetCurrent().GetSize() );
-  }
-}
-
-View::Orientation View::DegreeToViewOrientation( Degree degree )
-{
-  View::Orientation orientation = PORTRAIT;
-
-  if( fabsf( mOrientationFunction[PORTRAIT] - degree.degree ) <= GetRangedEpsilon( mOrientationFunction[PORTRAIT], degree.degree ) )
-  {
-    orientation =  PORTRAIT;
-  }
-  else if( fabsf( mOrientationFunction[LANDSCAPE] - degree.degree ) <= GetRangedEpsilon( mOrientationFunction[LANDSCAPE], degree.degree ) )
-  {
-    orientation = LANDSCAPE;
-  }
-  else if( fabsf( mOrientationFunction[PORTRAIT_INVERSE] - degree.degree ) <= GetRangedEpsilon( mOrientationFunction[PORTRAIT_INVERSE], degree.degree ) )
-  {
-    orientation = PORTRAIT_INVERSE;
-  }
-  else if( fabsf( mOrientationFunction[LANDSCAPE_INVERSE] - degree.degree ) <= GetRangedEpsilon( mOrientationFunction[LANDSCAPE_INVERSE], degree.degree ) )
-  {
-    orientation = LANDSCAPE_INVERSE;
-  }
-
-  return orientation;
-}
-
-View::LayerIt View::FindLayer( Layer layer )
-{
-  for( LayerIt it = mContentLayers.begin(); it != mContentLayers.end(); ++it )
-  {
-    if(layer == it->second)
-    {
-      return it;
-    }
-  }
-
-  return mContentLayers.end();
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/controls/view/view-impl.h b/dali-toolkit/internal/controls/view/view-impl.h
deleted file mode 100644 (file)
index b956eae..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_VIEW_H__
-#define __DALI_TOOLKIT_INTERNAL_VIEW_H__
-
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/layer.h>
-#include <dali/public-api/animation/animation.h>
-#include <dali/public-api/common/map-wrapper.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/view/view.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-class View;
-
-namespace Internal
-{
-
-/**
- * View is a control to add layers and a background.
- * @see Dali::Toolkit::View for more details.
- */
-class View : public Control
-{
-private:
-  typedef std::map<unsigned int,Layer> LayerContainer;
-  typedef std::map<unsigned int,Layer>::iterator LayerIt;
-  typedef std::map<unsigned int,Layer>::const_iterator LayerConstIt;
-
-  /**
-   * Orientation declaration used internally to rotate the view.
-   * The angles associated with each enum value could be changed with the SetOrientationFunction method.
-   */
-  enum Orientation
-  {
-    PORTRAIT,          ///< portrait orientation.
-    LANDSCAPE,         ///< landscape orientation.
-    PORTRAIT_INVERSE,  ///< portrait inverse orientation.
-    LANDSCAPE_INVERSE  ///< landscape inverse orientation.
-  };
-
-public:
-
-  /**
-   * Create an initialized View.
-   * @param fullscreen If true, the view's size is going to be set with the Dali::Stage size. Otherwise a size must be provided.
-   * @return A handle to a newly allocated Dali resource.
-   */
-  static Toolkit::View New( bool fullscreen );
-
-  /**
-   * @copydoc Dali::Toolkit::View::GetContentLayer()
-   */
-  Layer GetContentLayer( unsigned int index ) const;
-
-  /**
-   * @copydoc Dali::Toolkit::View::AddContentLayer()
-   */
-  unsigned int AddContentLayer( Layer layer );
-
-  /**
-   * @copydoc Dali::Toolkit::View::RemoveContentLayer()
-   */
-  void RemoveContentLayer( Layer layer );
-
-  /**
-   * @copydoc Dali::Toolkit::View::GetBackgroundLayer()
-   */
-  Layer GetBackgroundLayer() const;
-
-  /**
-   * @copydoc Dali::Toolkit::View::SetBackground()
-   */
-  void SetBackground( ImageActor image );
-
-  /**
-   * @copydoc Dali::Toolkit::View::SetOrientationFunction()
-   */
-  void SetOrientationFunction( Degree portrait, Degree landscale, Degree portraitInverse, Degree landscapeInverse );
-
-  /**
-   * @copydoc Dali::Toolkit::View::OrientationChanged()
-   *
-   */
-  void OrientationChanged( Dali::Orientation orientation );
-
-  /**
-   * @copydoc Dali::Toolkit::View::SetAutoRotate()
-   *
-   */
-  void SetAutoRotate( bool enabled );
-
-public:
-
-  /**
-   * @copydoc Dali::Toolkit::View::AnimationStartedSignalOrientation()
-   */
-  Toolkit::View::OrientationAnimationStartedSignalType& OrientationAnimationStartedSignal();
-
-  /**
-   * Connects a callback function with the object's signals.
-   * @param[in] object The object providing the signal.
-   * @param[in] tracker Used to disconnect the signal.
-   * @param[in] signalName The signal to connect to.
-   * @param[in] functor A newly allocated FunctorDelegate.
-   * @return True if the signal was connected.
-   * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor.
-   */
-  static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
-
-private: // From Control
-
-  /**
-   * @copydoc Toolkit::Control::OnInitialize()
-   */
-  virtual void OnInitialize();
-
-private:
-
-
-  /**
-   * Constructor.
-   * It initializes View members.
-   * It initializes orientations as follows: portrait 0, landscape 90, portrait inverse 180, landscape inverse 270.
-   * @param fullscreen If true, the view's size is going to be set with the Dali::Stage size. Otherwise a size must be provided.
-   */
-  View(bool fullscreen);
-
-  /**
-   * A reference counted object may only be deleted by calling Unreference()
-   */
-  virtual ~View();
-
-  /**
-   * Return an orientation for the given angle in degrees.
-   * @param degree angle in degrees.
-   * @return An internal orientation.
-   */
-  View::Orientation DegreeToViewOrientation( Degree degree );
-
-  /**
-   * Find a layer in the layer container. Non const method
-   */
-  LayerIt FindLayer( Layer layer );
-
-private:
-  int            mOrientation;            ///< Stores the given orientation in degrees.
-  bool           mFullScreen;             ///< Stores if the view is fullscreen or not.
-  LayerContainer mContentLayers;          ///< Layer container.
-  unsigned int   mNextLayerIndex;         ///< Next index to be used when a layer is added.
-  Layer          mBackgroundLayer;        ///< The background layer.
-  Animation      mRotateAnimation;        ///< The animation which rotates the view (and all layers added to it)
-  float          mOrientationFunction[4]; ///< The orientation function used to transform from degrees to the internal orientation.
-  bool           mAutoRotateEnabled;      ///< Whether the view rotates if the OrientationChanged method is called.
-
-  Toolkit::View::OrientationAnimationStartedSignalType mOrientationAnimationStartedSignal;
-};
-
-} // namespace Internal
-
-
-// Helpers for public-api forwarding methods
-
-inline Toolkit::Internal::View& GetImpl( Toolkit::View& view )
-{
-  DALI_ASSERT_ALWAYS( view );
-
-  Dali::RefObject& handle = view.GetImplementation();
-
-  return static_cast<Toolkit::Internal::View&>( handle );
-}
-
-inline const Toolkit::Internal::View& GetImpl( const Toolkit::View& view )
-{
-  DALI_ASSERT_ALWAYS( view );
-
-  const Dali::RefObject& handle = view.GetImplementation();
-
-  return static_cast<const Toolkit::Internal::View&>( handle );
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_TOOLKIT_INTERNAL_VIEW_H__
index e1693ad..0c37f7c 100644 (file)
@@ -81,7 +81,7 @@ DALI_TYPE_REGISTRATION_BEGIN_CREATE( Toolkit::KeyboardFocusManager, Dali::BaseHa
 DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboard-pre-focus-change",        SIGNAL_PRE_FOCUS_CHANGE        )
 DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboard-focus-changed",           SIGNAL_FOCUS_CHANGED           )
 DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboard-focus-group-changed",     SIGNAL_FOCUS_GROUP_CHANGED     )
-DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboard-focused-actor-activated", SIGNAL_FOCUSED_ACTOR_ACTIVATED )
+DALI_SIGNAL_REGISTRATION( Toolkit, KeyboardFocusManager, "keyboard-focused-actor-enter-key", SIGNAL_FOCUSED_ACTOR_ENTER_KEY )
 
 DALI_TYPE_REGISTRATION_END()
 
@@ -339,21 +339,21 @@ bool KeyboardFocusManager::DoMoveFocusToNextFocusGroup(bool forward)
   return succeed;
 }
 
-void KeyboardFocusManager::DoActivate(Actor actor)
+void KeyboardFocusManager::DoKeyboardEnter(Actor actor)
 {
-  if(actor)
+  if( actor )
   {
-    Toolkit::Control control = Toolkit::Control::DownCast(actor);
-    if(control)
+    Toolkit::Control control = Toolkit::Control::DownCast( actor );
+    if( control )
     {
-      // Notify the control that it is activated
-      GetImplementation( control ).AccessibilityActivate();
+      // Notify the control that enter has been pressed on it.
+      GetImplementation( control ).KeyboardEnter();
     }
 
-    // Send notification for the activation of focused actor
-    if( !mFocusedActorActivatedSignal.Empty() )
+    // Send a notification for the actor.
+    if( !mFocusedActorEnterKeySignal.Empty() )
     {
-      mFocusedActorActivatedSignal.Emit(actor);
+      mFocusedActorEnterKeySignal.Emit( actor );
     }
   }
 }
@@ -655,9 +655,9 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
       }
       else
       {
-        // Activate the focused actor
+        // The focused actor has enter pressed on it
         Actor actor;
-        if(!isAccessibilityEnabled)
+        if( !isAccessibilityEnabled )
         {
           actor = GetCurrentFocusActor();
         }
@@ -666,9 +666,9 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
           actor = accessibilityManager.GetCurrentFocusActor();
         }
 
-        if(actor)
+        if( actor )
         {
-          DoActivate(actor);
+          DoKeyboardEnter( actor );
         }
       }
 
@@ -714,9 +714,9 @@ Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType& KeyboardFocusManager
   return mFocusGroupChangedSignal;
 }
 
-Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType& KeyboardFocusManager::FocusedActorActivatedSignal()
+Toolkit::KeyboardFocusManager::FocusedActorEnterKeySignalType& KeyboardFocusManager::FocusedActorEnterKeySignal()
 {
-  return mFocusedActorActivatedSignal;
+  return mFocusedActorEnterKeySignal;
 }
 
 bool KeyboardFocusManager::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
@@ -738,9 +738,9 @@ bool KeyboardFocusManager::DoConnectSignal( BaseObject* object, ConnectionTracke
   {
     manager->FocusGroupChangedSignal().Connect( tracker, functor );
   }
-  else if( 0 == strcmp( signalName.c_str(), SIGNAL_FOCUSED_ACTOR_ACTIVATED ) )
+  else if( 0 == strcmp( signalName.c_str(), SIGNAL_FOCUSED_ACTOR_ENTER_KEY ) )
   {
-    manager->FocusedActorActivatedSignal().Connect( tracker, functor );
+    manager->FocusedActorEnterKeySignal().Connect( tracker, functor );
   }
   else
   {
index bc456c2..de3770f 100644 (file)
@@ -125,9 +125,9 @@ public:
   Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType& FocusGroupChangedSignal();
 
   /**
-   * @copydoc Toolkit::KeyboardFocusManager::FocusedActorActivatedSignal()
+   * @copydoc Toolkit::KeyboardFocusManager::FocusedActorEnterKeySignal()
    */
-  Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType& FocusedActorActivatedSignal();
+  Toolkit::KeyboardFocusManager::FocusedActorEnterKeySignalType& FocusedActorEnterKeySignal();
 
   /**
    * Connects a callback function with the object's signals.
@@ -183,11 +183,11 @@ private:
   bool DoMoveFocusToNextFocusGroup(bool forward);
 
   /**
-   * Activate the actor. If the actor is control, call OnActivated virtual function.
-   * This function will emit FocusedActorActivatedSignal.
-   * @param actor The actor to activate
+   * Enter has been pressed on the actor. If the actor is control, call the OnKeybaordEnter virtual function.
+   * This function will emit FocusedActorEnterKeySignal.
+   * @param actor The actor to notify
    */
-  void DoActivate(Actor actor);
+  void DoKeyboardEnter( Actor actor );
 
   /**
    * Create the default indicator actor to highlight the focused actor.
@@ -243,7 +243,7 @@ private:
   Toolkit::KeyboardFocusManager::PreFocusChangeSignalType mPreFocusChangeSignal; ///< The signal to notify the focus will be changed
   Toolkit::KeyboardFocusManager::FocusChangedSignalType mFocusChangedSignal; ///< The signal to notify the focus change
   Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType mFocusGroupChangedSignal; ///< The signal to notify the focus group change
-  Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType mFocusedActorActivatedSignal; ///< The signal to notify the activation of focused actor
+  Toolkit::KeyboardFocusManager::FocusedActorEnterKeySignalType mFocusedActorEnterKeySignal; ///< The signal to notify that enter has been pressed on the focused actor
 
   unsigned int mCurrentFocusActor; ///< The actor ID of current focused actor
 
index 0eb1caf..cf450ef 100644 (file)
@@ -903,7 +903,8 @@ struct Decorator::Impl : public ConnectionTracker
           mHandle[GRAB_HANDLE].actor.SetImage( imagePressed );
         }
       }
-      else if( TouchPoint::Up == point.state )
+      else if( ( TouchPoint::Up == point.state ) ||
+               ( TouchPoint::Interrupted == point.state ) )
       {
         mHandle[GRAB_HANDLE].pressed = false;
         Image imageReleased = mHandleImages[GRAB_HANDLE][HANDLE_IMAGE_RELEASED];
@@ -936,7 +937,8 @@ struct Decorator::Impl : public ConnectionTracker
           mHandle[LEFT_SELECTION_HANDLE].actor.SetImage( imagePressed );
         }
       }
-      else if( TouchPoint::Up == point.state )
+      else if( ( TouchPoint::Up == point.state ) ||
+               ( TouchPoint::Interrupted == point.state ) )
       {
         mHandle[LEFT_SELECTION_HANDLE].pressed = false;
         Image imageReleased = mHandleImages[flip ? RIGHT_SELECTION_HANDLE : LEFT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED];
@@ -969,7 +971,8 @@ struct Decorator::Impl : public ConnectionTracker
           mHandle[RIGHT_SELECTION_HANDLE].actor.SetImage( imagePressed );
         }
       }
-      else if( TouchPoint::Up == point.state )
+      else if( ( TouchPoint::Up == point.state ) ||
+               ( TouchPoint::Interrupted == point.state ) )
       {
         Image imageReleased = mHandleImages[flip ? LEFT_SELECTION_HANDLE : RIGHT_SELECTION_HANDLE][HANDLE_IMAGE_RELEASED];
         mHandle[RIGHT_SELECTION_HANDLE].pressed = false;
@@ -1348,6 +1351,20 @@ float Decorator::GetCursorBlinkDuration() const
 void Decorator::SetHandleActive( HandleType handleType, bool active )
 {
   mImpl->mHandle[handleType].active = active;
+
+  if( !active )
+  {
+    // TODO: this is a work-around.
+    // The problem is the handle actor does not receive the touch event with the Interrupt
+    // state when the power button is pressed and the application goes to background.
+    mImpl->mHandle[handleType].pressed = false;
+    Image imageReleased = mImpl->mHandleImages[handleType][HANDLE_IMAGE_RELEASED];
+    ImageActor imageActor = mImpl->mHandle[handleType].actor;
+    if( imageReleased && imageActor )
+    {
+       imageActor.SetImage( imageReleased );
+    }
+  }
 }
 
 bool Decorator::IsHandleActive( HandleType handleType ) const
index 5df31dc..08790c2 100644 (file)
@@ -136,7 +136,8 @@ EventData::EventData( DecoratorPtr decorator )
   mUpdateLeftSelectionPosition( false ),
   mUpdateRightSelectionPosition( false ),
   mScrollAfterUpdatePosition( false ),
-  mScrollAfterDelete( false )
+  mScrollAfterDelete( false ),
+  mAllTextSelected( false )
 {}
 
 EventData::~EventData()
@@ -237,6 +238,7 @@ bool Controller::Impl::ProcessInputEvents()
         leftScroll = true;
       }
 
+      SetPopupButtons();
       mEventData->mDecoratorUpdated = true;
       mEventData->mUpdateLeftSelectionPosition = false;
     }
@@ -253,6 +255,7 @@ bool Controller::Impl::ProcessInputEvents()
         rightScroll = true;
       }
 
+      SetPopupButtons();
       mEventData->mDecoratorUpdated = true;
       mEventData->mUpdateRightSelectionPosition = false;
     }
@@ -966,6 +969,47 @@ void Controller::Impl::RepositionSelectionHandles( float visualX, float visualY
   RepositionSelectionHandles( selectionStart, selectionEnd );
 }
 
+void Controller::Impl::SetPopupButtons()
+{
+  /**
+   *  Sets the Popup buttons to be shown depending on State.
+   *
+   *  If SELECTING :  CUT & COPY + ( PASTE & CLIPBOARD if content available to paste )
+   *
+   *  If EDITING_WITH_POPUP : SELECT & SELECT_ALL
+   */
+
+  TextSelectionPopup::Buttons buttonsToShow = TextSelectionPopup::NONE;
+
+  if ( ( EventData::SELECTING == mEventData->mState ) || ( EventData::SELECTION_CHANGED == mEventData->mState ) )
+  {
+    buttonsToShow = TextSelectionPopup::Buttons(  TextSelectionPopup::CUT | TextSelectionPopup::COPY );
+
+    if ( !IsClipboardEmpty() )
+    {
+      buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::PASTE ) );
+      buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::CLIPBOARD ) );
+    }
+
+    if ( !mEventData->mAllTextSelected )
+    {
+      buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::SELECT_ALL ) );
+    }
+  }
+  else if  ( EventData::EDITING_WITH_POPUP == mEventData->mState )
+  {
+    buttonsToShow = TextSelectionPopup::Buttons( TextSelectionPopup::SELECT | TextSelectionPopup::SELECT_ALL );
+
+    if ( !IsClipboardEmpty() )
+    {
+      buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::PASTE ) );
+      buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::CLIPBOARD ) );
+    }
+  }
+
+  mEventData->mDecorator->SetEnabledPopupButtons( buttonsToShow );
+}
+
 void Controller::Impl::ChangeState( EventData::State newState )
 {
   if( NULL == mEventData )
@@ -998,14 +1042,7 @@ void Controller::Impl::ChangeState( EventData::State newState )
       mEventData->mDecorator->SetHandleActive( RIGHT_SELECTION_HANDLE, true );
       if( mEventData->mGrabHandlePopupEnabled )
       {
-        TextSelectionPopup::Buttons buttonsToShow = TextSelectionPopup::Buttons(  TextSelectionPopup::CUT | TextSelectionPopup::COPY );
-        if ( !IsClipboardEmpty() )
-        {
-          buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::PASTE ) );
-          buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::CLIPBOARD ) );
-        }
-
-        mEventData->mDecorator->SetEnabledPopupButtons( buttonsToShow );
+        SetPopupButtons();
         mEventData->mDecorator->SetPopupActive( true );
       }
       mEventData->mDecoratorUpdated = true;
@@ -1014,14 +1051,8 @@ void Controller::Impl::ChangeState( EventData::State newState )
     {
       if( mEventData->mGrabHandlePopupEnabled )
       {
-        TextSelectionPopup::Buttons buttonsToShow = TextSelectionPopup::Buttons(  TextSelectionPopup::CUT | TextSelectionPopup::COPY );
-        if (  !IsClipboardEmpty() )
-        {
-          buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::PASTE ) );
-          buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::CLIPBOARD ) );
-        }
+        SetPopupButtons();
         mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE );
-        mEventData->mDecorator->SetEnabledPopupButtons( buttonsToShow );
         mEventData->mDecorator->SetPopupActive( true );
       }
       mEventData->mDecoratorUpdated = true;
@@ -1062,15 +1093,7 @@ void Controller::Impl::ChangeState( EventData::State newState )
       }
       if( mEventData->mGrabHandlePopupEnabled )
       {
-        TextSelectionPopup::Buttons buttonsToShow = TextSelectionPopup::Buttons( TextSelectionPopup::SELECT | TextSelectionPopup::SELECT_ALL );
-
-        if ( !IsClipboardEmpty() )
-        {
-          buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::PASTE ) );
-          buttonsToShow = TextSelectionPopup::Buttons ( ( buttonsToShow | TextSelectionPopup::CLIPBOARD ) );
-        }
-
-        mEventData->mDecorator->SetEnabledPopupButtons( buttonsToShow );
+        SetPopupButtons();
         mEventData->mDecorator->SetPopupActive( true );
       }
       HideClipboard();
@@ -1640,6 +1663,11 @@ void Controller::Impl::UpdateSelectionHandle( HandleType handleType )
                                        cursorPosition.x,
                                        cursorPosition.y,
                                        cursorInfo.lineHeight );
+
+  // If selection handle at start of the text and other at end of the text then all text is selected.
+  const CharacterIndex startOfSelection = std::min( mEventData->mLeftSelectionPosition, mEventData->mRightSelectionPosition );
+  const CharacterIndex endOfSelection = std::max ( mEventData->mLeftSelectionPosition, mEventData->mRightSelectionPosition );
+  mEventData->mAllTextSelected = ( startOfSelection == 0 ) && ( endOfSelection == mLogicalModel->mText.Count() );
 }
 
 void Controller::Impl::ClampHorizontalScroll( const Vector2& actualSize )
index db0c0c3..24b10e8 100644 (file)
@@ -153,6 +153,7 @@ struct EventData
   bool mUpdateRightSelectionPosition    : 1;   ///< True if the visual position of the right selection handle must be recalculated.
   bool mScrollAfterUpdatePosition       : 1;   ///< Whether to scroll after the cursor position is updated.
   bool mScrollAfterDelete               : 1;   ///< Whether to scroll after delete characters.
+  bool mAllTextSelected                 : 1;   ///< True if the selection handles are selecting all the text
 };
 
 struct ModifyEvent
@@ -354,8 +355,9 @@ struct Controller::Impl
   void RepositionSelectionHandles( CharacterIndex selectionStart, CharacterIndex selectionEnd );
   void RepositionSelectionHandles( float visualX, float visualY );
 
-  void ChangeState( EventData::State newState );
+  void SetPopupButtons();
 
+  void ChangeState( EventData::State newState );
   LineIndex GetClosestLine( float y ) const;
 
   void FindSelectionIndices( float visualX, float visualY, CharacterIndex& startIndex, CharacterIndex& endIndex );
index e8df944..814c4fe 100644 (file)
@@ -1152,6 +1152,11 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
     {
       textChanged = BackspaceKeyEvent();
     }
+    else if ( IsKey( keyEvent,  Dali::DALI_KEY_POWER ) || IsKey( keyEvent, Dali::DALI_KEY_MENU ) )
+    {
+      // Do nothing when the Power or Menu Key is pressed.
+      // It avoids call the InsertText() method and delete the selected text.
+    }
     else
     {
       DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", this, keyString.c_str() );
index bbc98b4..271a5ce 100644 (file)
@@ -64,12 +64,12 @@ BaseHandle Create()
  * @param[in] attributes The attributes with which to perfrom this action.
  * @return true if action has been accepted by this control
  */
-const char* ACTION_CONTROL_ACTIVATED = "control-activated";
+const char* ACTION_ACCESSIBILITY_ACTIVATED = "accessibility-activated";
 static bool DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes )
 {
   bool ret = false;
 
-  if( object && ( 0 == strcmp( actionName.c_str(), ACTION_CONTROL_ACTIVATED ) ) )
+  if( object && ( 0 == strcmp( actionName.c_str(), ACTION_ACCESSIBILITY_ACTIVATED ) ) )
   {
     Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );
     if( control )
@@ -158,7 +158,7 @@ SignalConnectorType registerSignal5( typeRegistration, SIGNAL_PANNED, &DoConnect
 SignalConnectorType registerSignal6( typeRegistration, SIGNAL_PINCHED, &DoConnectSignal );
 SignalConnectorType registerSignal7( typeRegistration, SIGNAL_LONG_PRESSED, &DoConnectSignal );
 
-TypeAction registerAction( typeRegistration, ACTION_CONTROL_ACTIVATED, &DoAction );
+TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &DoAction );
 
 DALI_TYPE_REGISTRATION_END()
 
@@ -767,11 +767,22 @@ void Control::AccessibilityActivate()
   OnAccessibilityActivated();
 }
 
+void Control::KeyboardEnter()
+{
+  // Inform deriving classes
+  OnKeyboardEnter();
+}
+
 bool Control::OnAccessibilityActivated()
 {
   return false; // Accessibility activation is not handled by default
 }
 
+bool Control::OnKeyboardEnter()
+{
+  return false; // Keyboard enter is not handled by default
+}
+
 bool Control::OnAccessibilityPan(PanGesture gesture)
 {
   return false; // Accessibility pan gesture is not handled by default
index ce793f3..1c3c35d 100644 (file)
@@ -222,13 +222,16 @@ public:
    */
   bool IsKeyboardFocusGroup();
 
-  // Called by Focus Manager
-
   /**
-   * @brief Called by the accessibility focus manager and keyboard focus manager to activate the Control
+   * @brief Called by the AccessibilityManager to activate the Control.
    */
   DALI_INTERNAL void AccessibilityActivate();
 
+  /**
+   * @brief Called by the KeyboardFocusManager.
+   */
+  DALI_INTERNAL void KeyboardEnter();
+
   // Signals
 
   /**
@@ -510,6 +513,14 @@ public: // API for derived classes to override
    */
   virtual void OnKeyboardFocusChangeCommitted( Actor commitedFocusableActor );
 
+  /**
+   * @brief This method is called when the control has enter pressed on it.
+   *
+   * Derived classes should override this to perform custom actions.
+   * @return true if this control supported this action.
+   */
+  virtual bool OnKeyboardEnter();
+
   // Gestures
 
   /**
index e7511a1..1e4d74d 100644 (file)
@@ -59,9 +59,9 @@ class Control;
  * | long-pressed           | @ref GetLongPressGestureDetector().DetectedSignal() |
  *
  * Actions
- * | %Action Name      | %Control method called                              |
- * |-------------------|-----------------------------------------------------|
- * | control-activated | %OnActivated()                                      |
+ * | %Action Name            | %Control method called                             |
+ * |-------------------------|----------------------------------------------------|
+ * | accessibility-activated | %OnAccessibilityActivated()                        |
  */
 class DALI_IMPORT_API Control : public CustomActor
 {
diff --git a/dali-toolkit/public-api/controls/view/view.h b/dali-toolkit/public-api/controls/view/view.h
deleted file mode 100644 (file)
index b42340c..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
-#ifndef __DALI_TOOLKIT_VIEW_H__
-#define __DALI_TOOLKIT_VIEW_H__
-
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
-#include <dali/public-api/adaptor-framework/orientation.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-namespace Internal DALI_INTERNAL
-{
-// Forward declarations
-class View;
-}
-
-/**
- * View provides a container where different Dali::Layer instances and a background could be added. It
- * also provides a View::OrientationChanged() method which could be connected to the Dali::Orientation::SignalChange() signal.
- * This method rotates all layers accordingly with the given orientation, it emits an OrientationAnimationStartsSignal signal just before the rotation animation starts.
- *
- * By default view anchor point and parent origin are centered, the size is full screen and is got directly from the Dali::Stage. However, by passing \e false to the
- * Toolkit::View::New() method a custom size could be specified, and after initialization, anchor point and parent origin could be updated.
- *
- * If a background is set, a background layer will be created and dropped to the bottom.
- *
- * Use example (application is a Dali::Application object):
- * \code{.cpp}
- * Stage stage = Stage::GetCurrent();
- *
- * // Create default View. By default it gets the stage size.
- * Toolkit::View view = Toolkit::View::New();
- *
- * // Add the view to the stage before setting the background.
- * stage.Add( view );
- *
- * // Set background image. BACKGROUND_IMAGE is a string with the background image file path.
- * Image backgroundImage = Image::New( BACKGROUND_IMAGE );
- * ImageActor backgroundImageActor = ImageActor::New( backgroundImage );
- * mView.SetBackground( backgroundImageActor );
- *
- * // Connects the orientation signal with the View::OrientationChanged method.
- * application.GetWindow().GetOrientation().ChangedSignal().Connect( &view, &Toolkit::View::OrientationChanged );
- *
- * // Create a content layer.
- * Layer contentLayer = Layer::New();
- * contentLayer.SetAnchorPoint( AnchorPoint::CENTER );
- * contentLayer.SetParentOrigin( ParentOrigin::CENTER );
- * view.AddContentLayer( contentLayer );
- * \endcode
- *
- * Signals
- * | %Signal Name                | Method                                   |
- * |-----------------------------|------------------------------------------|
- * | orientation-animation-start | @ref OrientationAnimationStartedSignal() |
-
- */
-class DALI_IMPORT_API View : public Control
-{
-
-public:
-
-  /**
-   * Create a View handle; this can be initialised with View::New()
-   * Calling member functions with an uninitialised handle is not allowed.
-   */
-  View();
-
-  /**
-   * Copy constructor. Creates another handle that points to the same real object
-   * @param handle to copy from
-   */
-  View( const View& handle );
-
-  /**
-   * Assignment operator. Changes this handle to point to another real object
-   */
-  View& operator=( const View& handle );
-
-  /**
-   * @brief Destructor
-   *
-   * This is non-virtual since derived Handle types must not contain data or virtual methods.
-   */
-  ~View();
-
-  /**
-   * Create an initialized View.
-   * @param fullscreen If true, the view's size is going to be set with the Dali::Stage size. Otherwise a size must be provided. By default fullscreen is set to true.
-   * @return A handle to a newly allocated Dali resource.
-   */
-  static View New( bool fullscreen = true );
-
-  /**
-   * Downcast an Object handle to View. If handle points to a View the
-   * downcast produces valid handle. If not the returned handle is left uninitialized.
-   * @param[in] handle Handle to an object
-   * @return handle to a View or an uninitialized handle
-   */
-  static View DownCast( BaseHandle handle );
-
-  /**
-   * Returns a content layer.
-   * @param index to the layer container.
-   * @return A Layer handle if it exists, otherwise it returns an uninitialized handle.
-   */
-  Layer GetContentLayer( unsigned int index ) const;
-
-  /**
-   * Adds a new layer in the view.
-   * @pre layer must be initialized.
-   * @param layer A Layer handle.
-   * @return the an index that can be used to access the layer stores in the view.
-   */
-  unsigned int AddContentLayer( Layer layer );
-
-  /**
-   * Removes a layer from the view.
-   * @param layer The layer to be removed.
-   */
-  void RemoveContentLayer( Layer layer );
-
-  /**
-   * Returns the background layer.
-   * @return the background layer or an empty handle if any background has been set before.
-   */
-  Layer GetBackgroundLayer() const;
-
-  /**
-   * Sets a background image.
-   *
-   * It creates a background layer the first time this method is called and it is dropped to the bottom.
-   * Any previous set background will be replaced by the new one.
-   *
-   * @pre View must be on stage before calling SetBackground.
-   * @param image An image actor.
-   */
-  void SetBackground( ImageActor image );
-
-  /**
-   * Sets the angle values for portrait, landscape, portrait inverse and landscape inverse.
-   *
-   * These angles are used to rotate the views.
-   * By default, orientation angles are initialized as follows: portrait 0, landscape 90, portrait inverse 180, landscape inverse 270.
-   *
-   * @param portrait angle in degrees.
-   * @param landscale angle in degrees.
-   * @param portraitInverse angle in degrees.
-   * @param landscapeInverse angle in degrees.
-   */
-  void SetOrientationFunction( Degree portrait, Degree landscale, Degree portraitInverse, Degree landscapeInverse );
-
-  /**
-   * It rotates all layers to the new given orientation.
-   *
-   * @param orientation The new orientation.
-   */
-  void OrientationChanged( Orientation orientation );
-
-  /**
-   * Enables or disables the view's rotation when device orientation changes.
-   * @param enabled Whether auto-rotate should be enabled or disabled. By default is enabled.
-   */
-  void SetAutoRotate( bool enabled );
-
-public: //Signals
-
-  // Orientation change animation starts.
-  typedef Signal< void ( View, Animation&, const Orientation& ) > OrientationAnimationStartedSignalType;
-
-  /**
-   * Signal emitted just before the rotate animation starts when the device orientation changes.
-   */
-  OrientationAnimationStartedSignalType& OrientationAnimationStartedSignal();
-
-public: // Not intended for application developers
-
-  /**
-   * Creates a handle using the Toolkit::Internal implementation.
-   * @param[in]  implementation  The Control implementation.
-   */
-  DALI_INTERNAL View( Internal::View& implementation );
-
-  /**
-   * Allows the creation of this Control from an Internal::CustomActor pointer.
-   * @param[in]  internal  A pointer to the internal CustomActor.
-   */
-  explicit DALI_INTERNAL View( Dali::Internal::CustomActor* internal );
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // __DALI_TOOLKIT_VIEW_H__
index 2e0ffbe..a816ca2 100644 (file)
@@ -122,9 +122,9 @@ KeyboardFocusManager::FocusGroupChangedSignalType& KeyboardFocusManager::FocusGr
   return GetImpl(*this).FocusGroupChangedSignal();
 }
 
-KeyboardFocusManager::FocusedActorActivatedSignalType& KeyboardFocusManager::FocusedActorActivatedSignal()
+KeyboardFocusManager::FocusedActorEnterKeySignalType& KeyboardFocusManager::FocusedActorEnterKeySignal()
 {
-  return GetImpl(*this).FocusedActorActivatedSignal();
+  return GetImpl(*this).FocusedActorEnterKeySignal();
 }
 
 } // namespace Toolkit
index 6afcd6b..3383a47 100644 (file)
@@ -47,7 +47,7 @@ class KeyboardFocusManager;
  * | keyboard-pre-focus-change        | @ref PreFocusChangeSignal()        |
  * | keyboard-focus-changed           | @ref FocusChangedSignal()          |
  * | keyboard-focus-group-changed     | @ref FocusGroupChangedSignal()     |
- * | keyboard-focused-actor-activated | @ref FocusedActorActivatedSignal() |
+ * | keyboard-focused-actor-enter-key | @ref FocusedActorEnterKeySignal()  |
  */
 class DALI_IMPORT_API KeyboardFocusManager : public BaseHandle
 {
@@ -63,8 +63,8 @@ public:
   /// @brief Focus group changed signal
   typedef Signal< void ( Actor, bool ) > FocusGroupChangedSignalType;
 
-  /// @brief Focused actor activated signal
-  typedef Signal< void ( Actor ) > FocusedActorActivatedSignalType;
+  /// @brief Focused actor has the enter key pressed signal
+  typedef Signal< void ( Actor ) > FocusedActorEnterKeySignalType;
 
   /**
    * @brief Create a KeyboardFocusManager handle; this can be initialised with KeyboardFocusManager::New().
@@ -251,16 +251,16 @@ public: // Signals
   FocusGroupChangedSignalType& FocusGroupChangedSignal();
 
   /**
-   * @brief This signal is emitted when the current focused actor is activated.
+   * @brief This signal is emitted when the current focused actor has the enter key pressed on it.
    *
    * A callback of the following type may be connected:
    * @code
-   *   void YourCallbackName(Actor activatedActor);
+   *   void YourCallbackName(Actor enterPressedActor);
    * @endcode
    * @pre The Object has been initialized.
    * @return The signal to connect to.
    */
-  FocusedActorActivatedSignalType& FocusedActorActivatedSignal();
+  FocusedActorEnterKeySignalType& FocusedActorEnterKeySignal();
 
   // Not intended for application developers