Merge "Add a callback to get textfitted font size." into devel/master

diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
Simple merge

diff --cc dali-toolkit/internal/text/text-controller-impl.h
Simple merge

diff --cc dali-toolkit/internal/text/text-controller-relayouter.cpp
index d04483a,ed0ddc6..c38f92e
--- 1/dali-toolkit/internal/text/text-controller-relayouter.cpp
--- 2/dali-toolkit/internal/text/text-controller-relayouter.cpp
+++ b/dali-toolkit/internal/text/text-controller-relayouter.cpp
@@@ -255,9 -256,13 +256,13 @@@ void Controller::Relayouter::FitPointSi
      }
  
      model->mElideEnabled              = actualellipsis;
+     if(currentFitPointSize != pointSizeArray[bestSizeIndex])
+     {
+       impl.mTextFitChanged = true;
+     }
      impl.mFontDefaults->mFitPointSize = pointSizeArray[bestSizeIndex];
      impl.mFontDefaults->sizeDefined   = true;
 -    controller.ClearFontData();
 +    impl.ClearFontData();
    }
  }
  

diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge

diff --cc dali-toolkit/internal/text/text-controller.h
Simple merge