Fix for TextLabel demo styling

Change-Id: I2844fd73a4bb49389d3df8dc287785ed415d2823

Fix for TextLabel demo styling
Change-Id: I2844fd73a4bb49389d3df8dc287785ed415d2823
Paul Wisbey
1 parent 22d0bd3f
Showing 29 changed files with 87 additions and 15 deletions
demo/dali-table-view.cpp
examples/animated-shapes/animated-shapes-example.cpp
examples/blocks/blocks-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/builder/examples.cpp
examples/buttons/buttons-example.cpp
examples/cluster/cluster-example.cpp
examples/cube-transition-effect/cube-transition-effect-example.cpp
examples/dissolve-effect/dissolve-effect-example.cpp
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
examples/item-view/item-view-example.cpp
examples/logging/logging-example.cpp
examples/magnifier/magnifier-example.cpp
examples/motion-stretch/motion-stretch-example.cpp
examples/new-window/new-window-example.cpp
examples/page-turn-view/page-turn-view-example.cpp
examples/path-animation/path-animation.cpp
examples/radial-menu/radial-menu-example.cpp
examples/refraction-effect/refraction-effect-example.cpp
examples/scripting/launcher.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <sstream>
 #include <unistd.h>
-#include <dali-toolkit/public-api/styling/style-manager.h>
  
 // INTERNAL INCLUDES
 #include "shared/view.h"
@@ -216,9 +215,7 @@ void DaliTableView::SortAlphabetically( bool sortAlphabetically )
  
 void DaliTableView::Initialize( Application& application )
 {
-  // Provide the stylesheet
-  StyleManager styleManager = StyleManager::Get();
-  styleManager.RequestThemeChange( DALI_DEMO_THEME_PATH );
+  DemoHelper::RequestThemeChange();
  
   Stage::GetCurrent().KeyEventSignal().Connect( this, &DaliTableView::OnKeyEvent );
  
@@ -18,6 +18,8 @@
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
  
+#include "shared/view.h"
+
 using namespace Dali;
  
 namespace
@@ -47,6 +49,8 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
+    DemoHelper::RequestThemeChange();
+
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
  
@@ -289,6 +289,8 @@ public:
    */
   void Create(Application& application)
   {
+    DemoHelper::RequestThemeChange();
+
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
  
     // Creates a default view with a default tool bar.
@@ -95,6 +95,8 @@ private:
   // The Init signal is received once (only) during the Application lifetime
   void Create(Application& app)
   {
+    DemoHelper::RequestThemeChange();
+
     Stage stage = Stage::GetCurrent();
     Vector2 stageSize = stage.GetSize();
  
@@ -243,7 +243,7 @@ public:
   {
     if(!mTitleActor)
     {
-      mTitleActor = TextLabel::New();
+      mTitleActor = DemoHelper::CreateToolBarLabel( "" );
       // Add title to the tool bar.
       mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
     }
@@ -393,12 +393,8 @@ public:
  
   Actor MenuItem(const std::string& text)
   {
-    int size = static_cast<int>(DemoHelper::ScalePointSize(6));
-
-    std::ostringstream fontString;
-    fontString << "<font size="<< size <<">"<<  ShortName( text ) << "</font>";
-
-    TextLabel label = TextLabel::New( fontString.str() );
+    TextLabel label = TextLabel::New( ShortName( text ) );
+    label.SetProperty( Dali::Toolkit::Control::Property::STYLE_NAME, "builderlabel" );
     label.SetResizePolicy( FILL_TO_PARENT, WIDTH );
  
     // Hook up tap detector
@@ -508,6 +504,8 @@ public:
  
   void Create(Application& app)
   {
+    DemoHelper::RequestThemeChange();
+
     Stage stage = Stage::GetCurrent();
  
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleApp::OnKeyEvent);
@@ -108,6 +108,8 @@ class ButtonsController: public ConnectionTracker
   {
     // The Init signal is received once (only) during the Application lifetime
  
+    DemoHelper::RequestThemeChange();
+
     // Respond to key events
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ButtonsController::OnKeyEvent);
  
@@ -447,6 +447,8 @@ public:
    */
   void Create(Application& application)
   {
+    DemoHelper::RequestThemeChange();
+
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ClusterController::OnKeyEvent);
  
     Vector2 stageSize = Stage::GetCurrent().GetSize();
@@ -224,6 +224,8 @@ CubeTransitionApp::~CubeTransitionApp()
  
 void CubeTransitionApp::OnInit( Application& application )
 {
+  DemoHelper::RequestThemeChange();
+
   Stage::GetCurrent().KeyEventSignal().Connect(this, &CubeTransitionApp::OnKeyEvent);
  
   // Creates a default view with a default tool bar, the view is added to the stage.
@@ -208,6 +208,8 @@ DissolveEffectApp::~DissolveEffectApp()
  
 void DissolveEffectApp::OnInit( Application& application )
 {
+  DemoHelper::RequestThemeChange();
+
   Stage::GetCurrent().KeyEventSignal().Connect(this, &DissolveEffectApp::OnKeyEvent);
  
   // Creates a default view with a default tool bar, the view is added to the stage.
@@ -291,6 +291,8 @@ public:
   {
     std::cout << "ImageScalingScaleToFillController::Create" << std::endl;
  
+    DemoHelper::RequestThemeChange();
+
     // Get a handle to the stage:
     Stage stage = Stage::GetCurrent();
  
@@ -234,6 +234,8 @@ public:
    */
   void OnInit(Application& app)
   {
+    DemoHelper::RequestThemeChange();
+
     Stage stage = Dali::Stage::GetCurrent();
     stage.KeyEventSignal().Connect(this, &ItemViewExample::OnKeyEvent);
  
@@ -156,6 +156,8 @@ class LoggingController: public ConnectionTracker
   {
     // The Init signal is received once (only) during the Application lifetime
  
+    DemoHelper::RequestThemeChange();
+
     mCurrentLogger = 0;
     mPerformanceLoggers.reserve( NUM_LOGGERS );
     mPerformanceLoggers.resize( NUM_LOGGERS );
@@ -203,6 +203,8 @@ public:
    */
   void Create( Application& application )
   {
+    DemoHelper::RequestThemeChange();
+
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
  
     mStageSize = Stage::GetCurrent().GetSize();
@@ -124,6 +124,8 @@ public:
   {
     // The Init signal is received once (only) during the Application lifetime
  
+    DemoHelper::RequestThemeChange();
+
     Stage::GetCurrent().KeyEventSignal().Connect(this, &MotionStretchExampleApp::OnKeyEvent);
  
     // Creates a default view with a default tool bar.
@@ -116,6 +116,8 @@ NewWindowController::NewWindowController( Application&amp; application )
  
 void NewWindowController::Create( Application& app )
 {
+  DemoHelper::RequestThemeChange();
+
   Stage stage = Stage::GetCurrent();
   stage.SetBackgroundColor(Color::YELLOW);
  
@@ -22,6 +22,8 @@
 #include <string.h>
 #include <iostream>
  
+#include "shared/view.h"
+
 using namespace Dali;
 using namespace Dali::Toolkit;
  
@@ -226,6 +228,8 @@ void PageTurnController::OnInit( Application&amp; app )
 {
   // The Init signal is received once ( only ) during the Application lifetime
  
+  DemoHelper::RequestThemeChange();
+
   Stage::GetCurrent().KeyEventSignal().Connect(this, &PageTurnController::OnKeyEvent);
  
   Stage stage = Stage::GetCurrent();
@@ -436,6 +436,8 @@ public:
    */
   void Create( Application& application )
   {
+    DemoHelper::RequestThemeChange();
+
     // Get a handle to the stage:
     Stage stage = Stage::GetCurrent();
  
@@ -121,6 +121,8 @@ RadialMenuExample::~RadialMenuExample()
  
 void RadialMenuExample::OnInit(Application& app)
 {
+  DemoHelper::RequestThemeChange();
+
   Stage stage = Dali::Stage::GetCurrent();
  
   // The Init signal is received once (only) during the Application lifetime
@@ -318,6 +318,8 @@ private:
   // The Init signal is received once (only) during the Application lifetime
   void Create(Application& application)
   {
+    DemoHelper::RequestThemeChange();
+
     Stage stage = Stage::GetCurrent();
     mStageHalfSize = stage.GetSize() * 0.5f;
  
@@ -23,6 +23,8 @@
 #include <sys/stat.h>
 #include <dali/integration-api/debug.h>
  
+// INTERNAL INCLUDES
+#include "shared/view.h"
  
  
 using namespace Dali;
@@ -56,6 +58,8 @@ Launcher::~Launcher()
  
 void Launcher::Create( Dali::Application& application )
 {
+  DemoHelper::RequestThemeChange();
+
   TextLabel textActor = TextLabel::New( "JSON & JavaScript Launcher..." );
  
   // Reposition the actor
@@ -179,6 +179,8 @@ public:
    */
   void OnInit(Application& app)
   {
+    DemoHelper::RequestThemeChange();
+
     Stage stage = Dali::Stage::GetCurrent();
     stage.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
  
@@ -141,6 +141,8 @@ public:
    */
   void Create(Application& app)
   {
+    DemoHelper::RequestThemeChange();
+
     srand(0); // Want repeatable path
  
     Stage::GetCurrent().KeyEventSignal().Connect(this, &TestApp::OnKeyEvent);
@@ -157,6 +157,8 @@ public:
   {
     // The Init signal is received once (only) during the Application lifetime
  
+    DemoHelper::RequestThemeChange();
+
     Stage stage = Stage::GetCurrent();
  
     // Respond to key events
@@ -24,6 +24,9 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/public-api/text-abstraction/text-abstraction.h>
  
+// INTERNAL INCLUDES
+#include "shared/view.h"
+
 using namespace Dali;
 using namespace Dali::Toolkit;
  
@@ -60,6 +63,8 @@ public:
    */
   void Create( Application& application )
   {
+    DemoHelper::RequestThemeChange();
+
     Stage stage = Stage::GetCurrent();
  
     stage.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent);
@@ -20,13 +20,14 @@
  * @brief Basic usage of TextLabel control
  */
  
-// INTERNAL INCLUDES
-#include "shared/multi-language-strings.h"
-
 // EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/public-api/text-abstraction/text-abstraction.h>
  
+// INTERNAL INCLUDES
+#include "shared/multi-language-strings.h"
+#include "shared/view.h"
+
 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace MultiLanguageStrings;
@@ -56,6 +57,8 @@ public:
    */
   void Create( Application& application )
   {
+    DemoHelper::RequestThemeChange();
+
     Stage stage = Stage::GetCurrent();
  
     stage.KeyEventSignal().Connect(this, &TextLabelMultiLanguageExample::OnKeyEvent);
@@ -26,6 +26,7 @@
  
 // INTERNAL INCLUDES
 #include "shared/multi-language-strings.h"
+#include "shared/view.h"
  
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -95,6 +96,8 @@ public:
    */
   void Create( Application& application )
   {
+    DemoHelper::RequestThemeChange();
+
     Stage stage = Stage::GetCurrent();
  
     stage.KeyEventSignal().Connect(this, &TextLabelExample::OnKeyEvent);
@@ -25,7 +25,8 @@ distributing this software or its derivatives.
     "textlabel":
     {
       "font-family":"HelveticaNeue",
-      "font-style":"Regular"
+      "font-style":"Regular",
+      "point-size":18
     },
  
     "launcherlabel":
@@ -38,6 +39,11 @@ distributing this software or its derivatives.
       "point-size":18
     },
  
+    "builderlabel":
+    {
+      "point-size":13
+    },
+
     "textfield":
     {
       "font-family":"HelveticaNeue",
@@ -59,6 +59,11 @@ distributing this software or its derivatives.
       "point-size":10
     },
  
+    "builderlabel":
+    {
+      "point-size":10
+    },
+
     "textfield":
     {
       "font-family":"SamsungSans",
@@ -51,6 +51,13 @@ const Dali::Vector4           DEFAULT_TEXT_STYLE_COLOR(0.0f, 0.0f, 0.0f, 1.0f);
 const Dali::Toolkit::Alignment::Padding DEFAULT_PLAY_PADDING(12.0f, 12.0f, 12.0f, 12.0f);
 const Dali::Toolkit::Alignment::Padding DEFAULT_MODE_SWITCH_PADDING(8.0f, 8.0f, 8.0f, 8.0f);
  
+void RequestThemeChange()
+{
+  // Provide the stylesheet
+  Dali::Toolkit::StyleManager styleManager = Dali::Toolkit::StyleManager::Get();
+  styleManager.RequestThemeChange( DALI_DEMO_THEME_PATH );
+}
+
 float ScalePointSize(int pointSize)
 {
   Dali::Vector2 dpi = Dali::Stage::GetCurrent().GetDpi();