From 74177c1264be054639ac4bcd2a462e97129be516 Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Thu, 2 Apr 2015 10:56:48 +0100 Subject: [PATCH] Fix for TextLabel demo styling --- demo/dali-table-view.cpp | 5 +---- examples/animated-shapes/animated-shapes-example.cpp | 4 ++++ examples/blocks/blocks-example.cpp | 2 ++ examples/bubble-effect/bubble-effect-example.cpp | 2 ++ examples/builder/examples.cpp | 12 +++++------- examples/buttons/buttons-example.cpp | 2 ++ examples/cluster/cluster-example.cpp | 2 ++ examples/cube-transition-effect/cube-transition-effect-example.cpp | 2 ++ examples/dissolve-effect/dissolve-effect-example.cpp | 2 ++ examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp | 2 ++ examples/item-view/item-view-example.cpp | 2 ++ examples/logging/logging-example.cpp | 2 ++ examples/magnifier/magnifier-example.cpp | 2 ++ examples/motion-stretch/motion-stretch-example.cpp | 2 ++ examples/new-window/new-window-example.cpp | 2 ++ examples/page-turn-view/page-turn-view-example.cpp | 4 ++++ examples/path-animation/path-animation.cpp | 2 ++ examples/radial-menu/radial-menu-example.cpp | 2 ++ examples/refraction-effect/refraction-effect-example.cpp | 2 ++ examples/scripting/launcher.cpp | 4 ++++ examples/scroll-view/scroll-view-example.cpp | 2 ++ examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp | 2 ++ examples/size-negotiation/size-negotiation-example.cpp | 2 ++ examples/text-field/text-field-example.cpp | 5 +++++ examples/text-label-multi-language/text-label-multi-language-example.cpp | 9 ++++++--- examples/text-label/text-label-example.cpp | 3 +++ resources/style/demo-theme.json | 8 +++++++- resources/style/mobile/demo-theme.json | 5 +++++ shared/view.h | 7 +++++++ 29 files changed, 87 insertions(+), 15 deletions(-) diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index 5d4610b..9871c61 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -22,7 +22,6 @@ #include #include #include -#include // 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 ); diff --git a/examples/animated-shapes/animated-shapes-example.cpp b/examples/animated-shapes/animated-shapes-example.cpp index f73c796..40b058e 100644 --- a/examples/animated-shapes/animated-shapes-example.cpp +++ b/examples/animated-shapes/animated-shapes-example.cpp @@ -18,6 +18,8 @@ #include #include +#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(); diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp index 5412b0d..f8cce6f 100644 --- a/examples/blocks/blocks-example.cpp +++ b/examples/blocks/blocks-example.cpp @@ -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. diff --git a/examples/bubble-effect/bubble-effect-example.cpp b/examples/bubble-effect/bubble-effect-example.cpp index f86daa4..db2a52e 100644 --- a/examples/bubble-effect/bubble-effect-example.cpp +++ b/examples/bubble-effect/bubble-effect-example.cpp @@ -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(); diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp index 2fb6fda..cd3940b 100644 --- a/examples/builder/examples.cpp +++ b/examples/builder/examples.cpp @@ -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(DemoHelper::ScalePointSize(6)); - - std::ostringstream fontString; - fontString << ""<< ShortName( text ) << ""; - - 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); diff --git a/examples/buttons/buttons-example.cpp b/examples/buttons/buttons-example.cpp index ad35087..66e2293 100644 --- a/examples/buttons/buttons-example.cpp +++ b/examples/buttons/buttons-example.cpp @@ -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); diff --git a/examples/cluster/cluster-example.cpp b/examples/cluster/cluster-example.cpp index 8dce935..cf52aa9 100644 --- a/examples/cluster/cluster-example.cpp +++ b/examples/cluster/cluster-example.cpp @@ -447,6 +447,8 @@ public: */ void Create(Application& application) { + DemoHelper::RequestThemeChange(); + Stage::GetCurrent().KeyEventSignal().Connect(this, &ClusterController::OnKeyEvent); Vector2 stageSize = Stage::GetCurrent().GetSize(); diff --git a/examples/cube-transition-effect/cube-transition-effect-example.cpp b/examples/cube-transition-effect/cube-transition-effect-example.cpp index 219f659..656f6ee 100644 --- a/examples/cube-transition-effect/cube-transition-effect-example.cpp +++ b/examples/cube-transition-effect/cube-transition-effect-example.cpp @@ -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. diff --git a/examples/dissolve-effect/dissolve-effect-example.cpp b/examples/dissolve-effect/dissolve-effect-example.cpp index 6108f2b..53d54df 100644 --- a/examples/dissolve-effect/dissolve-effect-example.cpp +++ b/examples/dissolve-effect/dissolve-effect-example.cpp @@ -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. diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp index 1482fa9..68a4091 100644 --- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp +++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp @@ -291,6 +291,8 @@ public: { std::cout << "ImageScalingScaleToFillController::Create" << std::endl; + DemoHelper::RequestThemeChange(); + // Get a handle to the stage: Stage stage = Stage::GetCurrent(); diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp index 5a0acdc..f14a268 100644 --- a/examples/item-view/item-view-example.cpp +++ b/examples/item-view/item-view-example.cpp @@ -234,6 +234,8 @@ public: */ void OnInit(Application& app) { + DemoHelper::RequestThemeChange(); + Stage stage = Dali::Stage::GetCurrent(); stage.KeyEventSignal().Connect(this, &ItemViewExample::OnKeyEvent); diff --git a/examples/logging/logging-example.cpp b/examples/logging/logging-example.cpp index 889621a..184deb2 100644 --- a/examples/logging/logging-example.cpp +++ b/examples/logging/logging-example.cpp @@ -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 ); diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp index f28529b..632445f 100644 --- a/examples/magnifier/magnifier-example.cpp +++ b/examples/magnifier/magnifier-example.cpp @@ -203,6 +203,8 @@ public: */ void Create( Application& application ) { + DemoHelper::RequestThemeChange(); + Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent); mStageSize = Stage::GetCurrent().GetSize(); diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp index 4bcf08f..4535f44 100644 --- a/examples/motion-stretch/motion-stretch-example.cpp +++ b/examples/motion-stretch/motion-stretch-example.cpp @@ -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. diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp index 39b0db2..877aa2d 100644 --- a/examples/new-window/new-window-example.cpp +++ b/examples/new-window/new-window-example.cpp @@ -116,6 +116,8 @@ NewWindowController::NewWindowController( Application& application ) void NewWindowController::Create( Application& app ) { + DemoHelper::RequestThemeChange(); + Stage stage = Stage::GetCurrent(); stage.SetBackgroundColor(Color::YELLOW); diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp index 8f5d147..33498cd 100644 --- a/examples/page-turn-view/page-turn-view-example.cpp +++ b/examples/page-turn-view/page-turn-view-example.cpp @@ -22,6 +22,8 @@ #include #include +#include "shared/view.h" + using namespace Dali; using namespace Dali::Toolkit; @@ -226,6 +228,8 @@ void PageTurnController::OnInit( Application& 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(); diff --git a/examples/path-animation/path-animation.cpp b/examples/path-animation/path-animation.cpp index 5ee4f0a..c143174 100644 --- a/examples/path-animation/path-animation.cpp +++ b/examples/path-animation/path-animation.cpp @@ -436,6 +436,8 @@ public: */ void Create( Application& application ) { + DemoHelper::RequestThemeChange(); + // Get a handle to the stage: Stage stage = Stage::GetCurrent(); diff --git a/examples/radial-menu/radial-menu-example.cpp b/examples/radial-menu/radial-menu-example.cpp index f022eb0..2ad18bb 100644 --- a/examples/radial-menu/radial-menu-example.cpp +++ b/examples/radial-menu/radial-menu-example.cpp @@ -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 diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp index 7a3a290..951bab3 100644 --- a/examples/refraction-effect/refraction-effect-example.cpp +++ b/examples/refraction-effect/refraction-effect-example.cpp @@ -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; diff --git a/examples/scripting/launcher.cpp b/examples/scripting/launcher.cpp index 3106aec..9c48b3f 100644 --- a/examples/scripting/launcher.cpp +++ b/examples/scripting/launcher.cpp @@ -23,6 +23,8 @@ #include #include +// 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 diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp index a1743c3..30d0a90 100644 --- a/examples/scroll-view/scroll-view-example.cpp +++ b/examples/scroll-view/scroll-view-example.cpp @@ -179,6 +179,8 @@ public: */ void OnInit(Application& app) { + DemoHelper::RequestThemeChange(); + Stage stage = Dali::Stage::GetCurrent(); stage.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent); diff --git a/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp b/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp index 9d42d68..36ccf4f 100644 --- a/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp +++ b/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp @@ -141,6 +141,8 @@ public: */ void Create(Application& app) { + DemoHelper::RequestThemeChange(); + srand(0); // Want repeatable path Stage::GetCurrent().KeyEventSignal().Connect(this, &TestApp::OnKeyEvent); diff --git a/examples/size-negotiation/size-negotiation-example.cpp b/examples/size-negotiation/size-negotiation-example.cpp index 8a35da7..54f9fa8 100644 --- a/examples/size-negotiation/size-negotiation-example.cpp +++ b/examples/size-negotiation/size-negotiation-example.cpp @@ -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 diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp index a738b18..65e6724 100644 --- a/examples/text-field/text-field-example.cpp +++ b/examples/text-field/text-field-example.cpp @@ -24,6 +24,9 @@ #include #include +// 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); diff --git a/examples/text-label-multi-language/text-label-multi-language-example.cpp b/examples/text-label-multi-language/text-label-multi-language-example.cpp index c1f5e2d..6efed44 100644 --- a/examples/text-label-multi-language/text-label-multi-language-example.cpp +++ b/examples/text-label-multi-language/text-label-multi-language-example.cpp @@ -20,13 +20,14 @@ * @brief Basic usage of TextLabel control */ -// INTERNAL INCLUDES -#include "shared/multi-language-strings.h" - // EXTERNAL INCLUDES #include #include +// 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); diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp index a8476bf..c19dbaa 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-example.cpp @@ -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); diff --git a/resources/style/demo-theme.json b/resources/style/demo-theme.json index 47e0e3d..89650ce 100644 --- a/resources/style/demo-theme.json +++ b/resources/style/demo-theme.json @@ -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", diff --git a/resources/style/mobile/demo-theme.json b/resources/style/mobile/demo-theme.json index 88d2b67..7ecff98 100644 --- a/resources/style/mobile/demo-theme.json +++ b/resources/style/mobile/demo-theme.json @@ -59,6 +59,11 @@ distributing this software or its derivatives. "point-size":10 }, + "builderlabel": + { + "point-size":10 + }, + "textfield": { "font-family":"SamsungSans", diff --git a/shared/view.h b/shared/view.h index 53c4218..091a595 100644 --- a/shared/view.h +++ b/shared/view.h @@ -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(); -- libgit2 0.21.4