Peter M. Groen / dali-demo

Commit 4d0bd400feeebfe732276ac82f01bacf5131685b

Authored by Paul Wisbey
1 parent 6ed1b97d

Initial removal of Text features 

Change-Id: I7bf40e4c988f4739dd3cf9c42ac85f47701a5030
Inline Side-by-side
Showing 16 changed files with 31 additions and 384 deletions
build/tizen/examples/Makefile.am
  View file @4d0bd40
... ... @@ -34,8 +34,7 @@ bin_PROGRAMS = \
34 34 dali-builder \
35 35 builder.example \
36 36 image-scaling-irregular-grid.example \
37   - buttons.example \
38   - text-view.example
  37 + buttons.example
39 38  
40 39  
41 40 daliimagedir = $(appdatadir)/images/
... ...
demo/dali-table-view.cpp
  View file @4d0bd40
... ... @@ -78,29 +78,13 @@ const float BACKGROUND_SIZE_SCALE = 2.0f;
78 78 const Vector4 BACKGROUND_COLOR( 1.0f, 1.0f, 1.0f, 1.0f );
79 79  
80 80  
81   -const std::string DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNeue");
82   -const std::string DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
83   -const Dali::PointSize DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f );
84   -const Dali::TextStyle::Weight DEFAULT_TEXT_STYLE_WEIGHT(Dali::TextStyle::REGULAR);
85   -const Dali::Vector4 DEFAULT_TEXT_STYLE_COLOR(0.7f, 0.7f, 0.7f, 1.0f);
  81 +//const std::string DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNeue");
  82 +//const std::string DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
  83 +//const Dali::Vector4 DEFAULT_TEXT_STYLE_COLOR(0.7f, 0.7f, 0.7f, 1.0f);
86 84  
87   -const std::string TABLE_TEXT_STYLE_FONT_FAMILY("HelveticaNeue");
88   -const std::string TABLE_TEXT_STYLE_FONT_STYLE("Regular");
89   -const Dali::PointSize TABLE_TEXT_STYLE_POINT_SIZE( 8.0f );
90   -const Dali::TextStyle::Weight TABLE_TEXT_STYLE_WEIGHT(Dali::TextStyle::LIGHT);
91   -const Dali::Vector4 TABLE_TEXT_STYLE_COLOR(0.0f, 0.0f, 0.0f, 1.0f);
92   -
93   -
94   -TextStyle GetTableTextStyle()
95   -{
96   - TextStyle textStyle;
97   - textStyle.SetFontName(TABLE_TEXT_STYLE_FONT_FAMILY);
98   - textStyle.SetFontStyle(TABLE_TEXT_STYLE_FONT_STYLE);
99   - textStyle.SetFontPointSize( Dali::PointSize(DemoHelper::ScalePointSize(TABLE_TEXT_STYLE_POINT_SIZE)));
100   - textStyle.SetWeight(TABLE_TEXT_STYLE_WEIGHT);
101   - textStyle.SetTextColor(TABLE_TEXT_STYLE_COLOR);
102   - return textStyle;
103   -}
  85 +//const std::string TABLE_TEXT_STYLE_FONT_FAMILY("HelveticaNeue");
  86 +//const std::string TABLE_TEXT_STYLE_FONT_STYLE("Regular");
  87 +//const Dali::Vector4 TABLE_TEXT_STYLE_COLOR(0.0f, 0.0f, 0.0f, 1.0f);
104 88  
105 89 /**
106 90 * Creates the background image
... ... @@ -269,8 +253,7 @@ void DaliTableView::Initialize( Application& application )
269 253 Dali::Layer toolBarLayer = DemoHelper::CreateToolbar(toolbar,
270 254 DEFAULT_TOOLBAR_IMAGE_PATH,
271 255 DEFAULT_TOOLBAR_TEXT,
272   - DemoHelper::DEFAULT_VIEW_STYLE,
273   - DemoHelper::GetDefaultTextStyle());
  256 + DemoHelper::DEFAULT_VIEW_STYLE);
274 257  
275 258 mRootActor.AddChild( toolBarLayer, TableView::CellPosition( 0, 0 ) );
276 259 mRootActor.SetFixedHeight( 0, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarHeight );
... ... @@ -529,21 +512,6 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
529 512 image.Add( stencil );
530 513 }
531 514  
532   - TextView text = TextView::New( title );
533   - text.SetAnchorPoint( AnchorPoint::CENTER );
534   - text.SetParentOrigin( ParentOrigin::CENTER );
535   - text.SetWidthExceedPolicy( Toolkit::TextView::ShrinkToFit );
536   - text.SetMultilinePolicy( Toolkit::TextView::SplitByWord );
537   - text.SetLineJustification( Toolkit::TextView::Center );
538   - text.SetTextAlignment( Toolkit::Alignment::Type( Alignment::HorizontalCenter | Alignment::VerticalCenter ) );
539   - text.SetColor( Color::WHITE );
540   - text.SetZ( 1 );
541   - // make the text 90% of tile
542   - text.SetSize( 0.9f * parentSize.width, 0.9f * parentSize.height );
543   - text.SetStyleToCurrentText( GetTableTextStyle() );
544   - text.SetSnapshotModeEnabled( false );
545   - content.Add( text );
546   -
547 515 // Set the tile to be keyboard focusable
548 516 tile.SetKeyboardFocusable(true);
549 517  
... ...
examples/builder/examples.cpp
  View file @4d0bd40
... ... @@ -242,17 +242,7 @@ public:
242 242  
243 243 void SetTitle(const std::string& title)
244 244 {
245   - if(!mTitleActor)
246   - {
247   - mTitleActor = TextView::New();
248   - // Add title to the tool bar.
249   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
250   - }
251   -
252   - Font font = Font::New();
253   - mTitleActor.SetText( title );
254   - mTitleActor.SetSize( font.MeasureText( title ) );
255   - mTitleActor.SetStyleToCurrentText(DemoHelper::GetDefaultTextStyle());
  245 + // TODO
256 246 }
257 247  
258 248 bool OnToolSelectLayout( Toolkit::Button button )
... ... @@ -402,18 +392,7 @@ public:
402 392  
403 393 Actor MenuItem(const std::string& text)
404 394 {
405   - TextView t = TextView::New();
406   - t.SetMarkupProcessingEnabled(true);
407   -
408   - int size = static_cast<int>(DemoHelper::ScalePointSize(6));
409   -
410   - std::ostringstream fontString;
411   - fontString << "<font size="<< size <<">"<< ShortName( text ) << "</font>";
412   -
413   - t.SetText( fontString.str() );
414   -
415   - t.SetTextAlignment( Alignment::HorizontalLeft );
416   - return t;
  395 + return Actor();
417 396 }
418 397  
419 398 bool OnTimer()
... ... @@ -604,7 +583,6 @@ private:
604 583 unsigned int mOrientation;
605 584  
606 585 Toolkit::ToolBar mToolBar;
607   - TextView mTitleActor; ///< The Toolbar's Title.
608 586  
609 587 Layer mBuilderLayer;
610 588  
... ...
examples/buttons/buttons-example.cpp
  View file @4d0bd40
... ... @@ -234,11 +234,6 @@ class ButtonsController: public ConnectionTracker
234 234 Toolkit::TableView tableView = Toolkit::TableView::New( 1, 2 );
235 235 tableView.SetSize( DP(260), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
236 236  
237   - Toolkit::TextView textView = Toolkit::TextView::New( "Select enabled" );
238   - Toolkit::Alignment alignment = Toolkit::Alignment::New( Toolkit::Alignment::HorizontalLeft );
239   - alignment.Add( textView );
240   - tableView.AddChild( alignment, Toolkit::TableView::CellPosition( 0, 0 ) );
241   -
242 237 ImageActor imageActor = ImageActor::New( Image::New( ENABLED_IMAGE ) );
243 238 imageActor.SetSize( DP(RADIO_LABEL_THUMBNAIL_SIZE), DP(RADIO_LABEL_THUMBNAIL_SIZE) );
244 239 tableView.AddChild( imageActor, Toolkit::TableView::CellPosition( 0, 1 ) );
... ... @@ -298,13 +293,6 @@ class ButtonsController: public ConnectionTracker
298 293 checkBoxBackground.Add( checkBox );
299 294 }
300 295  
301   - mCheckBox1State = Toolkit::TextView::New( "CheckBox1 is unchecked" );
302   -
303   - mCheckBox1State.SetAnchorPoint( AnchorPoint::TOP_LEFT );
304   - mCheckBox1State.SetPosition( DP(80), DP(checkYPos) );
305   -
306   - checkBoxBackground.Add( mCheckBox1State );
307   -
308 296 checkYPos += 60;
309 297  
310 298 {
... ... @@ -321,13 +309,6 @@ class ButtonsController: public ConnectionTracker
321 309 checkBoxBackground.Add( checkBox );
322 310 }
323 311  
324   - mCheckBox2State = Toolkit::TextView::New( "CheckBox2 is checked" );
325   - mCheckBox2State.SetParentOrigin( ParentOrigin::TOP_LEFT );
326   - mCheckBox2State.SetAnchorPoint( AnchorPoint::TOP_LEFT );
327   - mCheckBox2State.SetPosition( DP(80), DP(checkYPos) );
328   -
329   - checkBoxBackground.Add( mCheckBox2State );
330   -
331 312 checkYPos += 60;
332 313  
333 314 {
... ... @@ -343,13 +324,6 @@ class ButtonsController: public ConnectionTracker
343 324 checkBoxBackground.Add( checkBox );
344 325 }
345 326  
346   - mCheckBox3State = Toolkit::TextView::New( "CheckBox3 is unchecked" );
347   -
348   - mCheckBox3State.SetAnchorPoint( AnchorPoint::TOP_LEFT );
349   - mCheckBox3State.SetPosition( DP(80), DP(checkYPos) );
350   -
351   - checkBoxBackground.Add( mCheckBox3State );
352   -
353 327 // Create toggle button
354 328 yPos += GROUP3_HEIGHT + MARGIN_SIZE;
355 329  
... ... @@ -440,42 +414,6 @@ class ButtonsController: public ConnectionTracker
440 414  
441 415 bool OnCheckBoxesToggled( Toolkit::Button button, bool state )
442 416 {
443   - if( button.GetName() == "checkbox1" )
444   - {
445   - if( state )
446   - {
447   - mCheckBox1State.SetText("CheckBox1 is checked");
448   - }
449   - else
450   - {
451   - mCheckBox1State.SetText("CheckBox1 is unchecked");
452   - }
453   - }
454   -
455   - if( button.GetName() == "checkbox2" )
456   - {
457   - if( state )
458   - {
459   - mCheckBox2State.SetText("CheckBox2 is checked");
460   - }
461   - else
462   - {
463   - mCheckBox2State.SetText("CheckBox2 is unchecked");
464   - }
465   - }
466   -
467   - if( button.GetName() == "checkbox3" )
468   - {
469   - if( state )
470   - {
471   - mCheckBox3State.SetText("CheckBox3 is checked");
472   - }
473   - else
474   - {
475   - mCheckBox3State.SetText("CheckBox3 is unchecked");
476   - }
477   - }
478   -
479 417 return true;
480 418 }
481 419  
... ... @@ -496,10 +434,6 @@ class ButtonsController: public ConnectionTracker
496 434 Image mBigImage2;
497 435 Image mBigImage3;
498 436 ImageActor mImage;
499   -
500   - Toolkit::TextView mCheckBox1State;
501   - Toolkit::TextView mCheckBox2State;
502   - Toolkit::TextView mCheckBox3State;
503 437 };
504 438  
505 439 void RunTest( Application& application )
... ...
examples/cluster/cluster-example.cpp
  View file @4d0bd40
... ... @@ -873,17 +873,7 @@ public:
873 873 */
874 874 void SetTitle(const std::string& title)
875 875 {
876   - if(!mTitleActor)
877   - {
878   - mTitleActor = TextView::New();
879   - // Add title to the tool bar.
880   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
881   - }
882   -
883   - Font font = Font::New();
884   - mTitleActor.SetText( title );
885   - mTitleActor.SetSize( font.MeasureText( title ) );
886   - mTitleActor.SetStyleToCurrentText(DemoHelper::GetDefaultTextStyle());
  876 + // TODO
887 877 }
888 878  
889 879 /**
... ... @@ -905,7 +895,6 @@ private:
905 895 Application& mApplication; ///< Application instance
906 896 Toolkit::View mView; ///< The View instance.
907 897 Toolkit::ToolBar mToolBar; ///< The View's Toolbar.
908   - TextView mTitleActor; ///< The Toolbar's Title.
909 898  
910 899 Layer mContentLayer; ///< Content layer (scrolling cluster content)
911 900  
... ...
examples/hello-world/hello-world-example.cpp
  View file @4d0bd40
... ... @@ -42,22 +42,7 @@ public:
42 42 // The Init signal is received once (only) during the Application lifetime
43 43 void Create( Application& application )
44 44 {
45   - std::cout << "HelloWorldController::Create" << std::endl;
46   -
47   - // Initialize the actor
48   - TextActor textActor = TextActor::New( "Hello World" );
49   -
50   - // Reposition the actor
51   - textActor.SetParentOrigin( ParentOrigin::CENTER );
52   -
53   - // Get a handle to the stage
54   - Stage stage = Stage::GetCurrent();
55   -
56   - // Display the actor on the stage
57   - stage.Add( textActor );
58   -
59   - // Respond to a click anywhere on the stage
60   - stage.GetRootLayer().TouchedSignal().Connect( this, &HelloWorldController::OnTouch );
  45 + // TODO
61 46 }
62 47  
63 48 bool OnTouch( Actor actor, const TouchEvent& touch )
... ...
examples/image/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @4d0bd40
... ... @@ -531,17 +531,7 @@ public:
531 531 */
532 532 void SetTitle(const std::string& title)
533 533 {
534   - if(!mTitleActor)
535   - {
536   - mTitleActor = TextView::New();
537   - // Add title to the tool bar.
538   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
539   - }
540   -
541   - Font font = Font::New();
542   - mTitleActor.SetText( title );
543   - mTitleActor.SetSize( font.MeasureText( title ) );
544   - mTitleActor.SetStyleToCurrentText(DemoHelper::GetDefaultTextStyle());
  534 + // TODO
545 535 }
546 536  
547 537 /**
... ... @@ -570,7 +560,6 @@ private:
570 560 Layer mContentLayer; ///< The content layer (contains non gui chrome actors)
571 561 Toolkit::View mView; ///< The View instance.
572 562 Toolkit::ToolBar mToolBar; ///< The View's Toolbar.
573   - TextView mTitleActor; ///< The Toolbar's Title.
574 563 Actor mGridActor; ///< The container for the grid of images
575 564 ScrollView mScrollView; ///< ScrollView UI Component
576 565 bool mScrolling; ///< ScrollView scrolling state (true = scrolling, false = stationary)
... ...
examples/item-view/item-view-example.cpp
  View file @4d0bd40
... ... @@ -105,9 +105,9 @@ AlphaFunction ALPHA_FUNCTIONS[] = { AlphaFunctions::Linear,
105 105  
106 106 const unsigned int NUM_ALPHA_FUNCTIONS = sizeof(ALPHA_FUNCTIONS) / sizeof(AlphaFunction);
107 107  
108   -const char* ALPHA_FUNCTIONS_TEXT[] = { "Linear",
109   - "EaseIn",
110   - "EaseOut" };
  108 +//const char* ALPHA_FUNCTIONS_TEXT[] = { "Linear",
  109 +// "EaseIn",
  110 +// "EaseOut" };
111 111  
112 112 const char* BACKGROUND_IMAGE( "" );
113 113 const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );
... ... @@ -156,11 +156,9 @@ const float BUTTON_BORDER = -10.0f;
156 156 const float MENU_OPTION_HEIGHT(140.0f);
157 157 const float LABEL_TEXT_SIZE_Y = 20.0f;
158 158  
159   -const char* DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNue");
160   -const char* DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
161   -const PointSize DEFAULT_TEXT_STYLE_POINT_SIZE( 5.0f );
162   -const TextStyle::Weight DEFAULT_TEXT_STYLE_WEIGHT(Dali::TextStyle::MEDIUM);
163   -const Vector4 DEFAULT_TEXT_STYLE_COLOR(1.0f, 1.0f, 1.0f, 1.0f);
  159 +//const char* DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNue");
  160 +//const char* DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
  161 +//const Vector4 DEFAULT_TEXT_STYLE_COLOR(1.0f, 1.0f, 1.0f, 1.0f);
164 162  
165 163 const Vector3 INITIAL_OFFSCREEN_POSITION( 1000.0f, 0, -1000.0f );
166 164  
... ... @@ -951,17 +949,7 @@ private:
951 949 */
952 950 void SetTitle(const std::string& title)
953 951 {
954   - if(!mTitleActor)
955   - {
956   - mTitleActor = TextView::New();
957   - // Add title to the tool bar.
958   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
959   - }
960   -
961   - Font font = Font::New();
962   - mTitleActor.SetText( title );
963   - mTitleActor.SetSize( font.MeasureText( title ) );
964   - mTitleActor.SetStyleToCurrentText(DemoHelper::GetDefaultTextStyle());
  952 + // TODO
965 953 }
966 954  
967 955 void ShowMenu()
... ... @@ -990,45 +978,6 @@ private:
990 978 tableView.AddChild( slider, TableView::CellPosition( 0, 0 ) );
991 979 tableView.SetRelativeHeight( 0, 0.5f );
992 980  
993   - TextStyle defaultTextStyle;
994   - defaultTextStyle.SetFontName(DEFAULT_TEXT_STYLE_FONT_FAMILY);
995   - defaultTextStyle.SetFontStyle(DEFAULT_TEXT_STYLE_FONT_STYLE);
996   - defaultTextStyle.SetFontPointSize(DEFAULT_TEXT_STYLE_POINT_SIZE);
997   - defaultTextStyle.SetWeight(DEFAULT_TEXT_STYLE_WEIGHT);
998   - defaultTextStyle.SetTextColor(DEFAULT_TEXT_STYLE_COLOR);
999   -
1000   - TextView text = TextView::New( "Duration" );
1001   - text.SetAnchorPoint( ParentOrigin::TOP_LEFT );
1002   - text.SetParentOrigin( ParentOrigin::TOP_LEFT );
1003   - text.SetTextAlignment( Dali::Toolkit::Alignment::HorizontalLeft );
1004   - text.SetStyleToCurrentText( defaultTextStyle );
1005   - text.SetSize( 0.0f, LABEL_TEXT_SIZE_Y );
1006   - text.ApplyConstraint( Dali::Constraint::New<float>( Dali::Actor::SIZE_WIDTH, Dali::ParentSource( Dali::Actor::SIZE_WIDTH ), Dali::EqualToConstraint() ) );
1007   - text.SetZ( -0.9f );
1008   - slider.Add( text );
1009   -
1010   - Actor textContainer = Actor::New();
1011   - mAlphaFunctionText = TextView::New( ALPHA_FUNCTIONS_TEXT[mAlphaFuncIndex] );
1012   - mAlphaFunctionText.SetAnchorPoint( ParentOrigin::CENTER );
1013   - mAlphaFunctionText.SetParentOrigin( ParentOrigin::CENTER );
1014   - mAlphaFunctionText.SetTextAlignment( Toolkit::Alignment::VerticalCenter );
1015   - textContainer.Add( mAlphaFunctionText );
1016   - tableView.AddChild( textContainer, TableView::CellPosition( 1, 0 ) );
1017   - tableView.SetRelativeHeight( 0, 0.5f );
1018   -
1019   - mTapDetector = TapGestureDetector::New();
1020   - mTapDetector.Attach(mAlphaFunctionText);
1021   - mTapDetector.DetectedSignal().Connect( this, &ItemViewExample::ChangeAlphaFunctionOnTap );
1022   -
1023   - text = TextView::New( "Alpha Function" );
1024   - text.SetAnchorPoint( ParentOrigin::TOP_LEFT );
1025   - text.SetParentOrigin( ParentOrigin::TOP_LEFT );
1026   - text.SetTextAlignment( Dali::Toolkit::Alignment::HorizontalLeft );
1027   - text.SetStyleToCurrentText( defaultTextStyle );
1028   - text.SetSize( 0.0f, LABEL_TEXT_SIZE_Y );
1029   - text.ApplyConstraint( Dali::Constraint::New<float>( Dali::Actor::SIZE_WIDTH, Dali::ParentSource( Dali::Actor::SIZE_WIDTH ), Dali::EqualToConstraint() ) );
1030   - textContainer.Add( text );
1031   -
1032 981 mMenu.Show();
1033 982 mMenuShown = true;
1034 983 }
... ... @@ -1047,11 +996,6 @@ private:
1047 996 mAlphaFuncIndex = 0;
1048 997 }
1049 998  
1050   - if( mAlphaFunctionText )
1051   - {
1052   - mAlphaFunctionText.SetText( ALPHA_FUNCTIONS_TEXT[mAlphaFuncIndex] );
1053   - }
1054   -
1055 999 if( mItemView )
1056 1000 {
1057 1001 mItemView.GetActiveLayout()->SetAlphaFunction( ALPHA_FUNCTIONS[mAlphaFuncIndex] );
... ... @@ -1113,7 +1057,6 @@ private:
1113 1057 unsigned int mOrientation;
1114 1058  
1115 1059 Toolkit::ToolBar mToolBar;
1116   - TextView mTitleActor; ///< The Toolbar's Title.
1117 1060  
1118 1061 ItemView mItemView;
1119 1062 Image mBorderImage;
... ... @@ -1133,7 +1076,6 @@ private:
1133 1076 Toolkit::PushButton mReplaceButton;
1134 1077  
1135 1078 unsigned int mAlphaFuncIndex;
1136   - TextView mAlphaFunctionText;
1137 1079 BitmapImage mWhiteImage;
1138 1080 };
1139 1081  
... ...
examples/motion/motion-blur-example.cpp
  View file @4d0bd40
... ... @@ -487,7 +487,6 @@ private:
487 487 Application& mApplication; ///< Application instance
488 488 Toolkit::View mView;
489 489 Toolkit::ToolBar mToolBar;
490   - TextView mTitleActor; ///< The Toolbar's Title.
491 490 Image mIconEffectsOff;
492 491 Image mIconEffectsOn;
493 492  
... ...
examples/motion/motion-stretch-example.cpp
  View file @4d0bd40
... ... @@ -399,7 +399,6 @@ private:
399 399 Application& mApplication; ///< Application instance
400 400 Toolkit::View mView;
401 401 Toolkit::ToolBar mToolBar;
402   - TextView mTitleActor; ///< The Toolbar's Title.
403 402 Image mIconEffectsOff;
404 403 Image mIconEffectsOn;
405 404 Layer mContentLayer; ///< Content layer (contains actor for this stretch demo)
... ...
examples/new-window/new-window-example.cpp
  View file @4d0bd40
... ... @@ -83,7 +83,6 @@ private:
83 83 Animation mModelAnimation;
84 84 Actor mModelActor;
85 85 Actor mCastingLight;
86   - TextActor mTextActor;
87 86 ImageActor mImageActor;
88 87 ImageActor mBlendActor;
89 88 Image mEffectImage;
... ... @@ -95,7 +94,6 @@ private:
95 94  
96 95 Toolkit::View mView; ///< The View instance.
97 96 Toolkit::ToolBar mToolBar; ///< The View's Toolbar.
98   - TextView mTitleActor; ///< The Toolbar's Title.
99 97 Layer mContentLayer; ///< Content layer (scrolling cluster content)
100 98 Toolkit::PushButton mLoseContextButton;
101 99 Vector3 mHSVDelta;
... ... @@ -182,7 +180,6 @@ void NewWindowController::Create( Application&amp; app )
182 180  
183 181 void NewWindowController::Destroy( Application& app )
184 182 {
185   - UnparentAndReset(mTextActor);
186 183 }
187 184  
188 185 bool NewWindowController::OnLoseContextButtonClicked( Toolkit::Button button )
... ... @@ -387,11 +384,7 @@ void NewWindowController::CreateBlending()
387 384  
388 385 void NewWindowController::CreateText()
389 386 {
390   - mTextActor = TextActor::New("Some text");
391   - mTextActor.SetParentOrigin(ParentOrigin::CENTER);
392   - mTextActor.SetColor(Color::RED);
393   - mTextActor.SetName("PushMe text");
394   - mContentLayer.Add( mTextActor );
  387 + // TODO
395 388 }
396 389  
397 390 Mesh NewWindowController::CreateMesh(bool hasColor, Material material)
... ...
examples/scroll-view/scroll-view-example.cpp
  View file @4d0bd40
... ... @@ -669,17 +669,6 @@ private:
669 669 */
670 670 void SetTitle(const std::string& title)
671 671 {
672   - if(!mTitleActor)
673   - {
674   - mTitleActor = TextView::New();
675   - // Add title to the tool bar.
676   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
677   - }
678   -
679   - Font font = Font::New();
680   - mTitleActor.SetText( title );
681   - mTitleActor.SetSize( font.MeasureText( title ) );
682   - mTitleActor.SetStyleToCurrentText(DemoHelper::GetDefaultTextStyle());
683 672 }
684 673  
685 674 /**
... ... @@ -701,7 +690,6 @@ private:
701 690 Application& mApplication; ///< Application instance
702 691 Toolkit::View mView; ///< The View instance.
703 692 Toolkit::ToolBar mToolBar; ///< The View's Toolbar.
704   - TextView mTitleActor; ///< The Toolbar's Title.
705 693 Layer mContentLayer; ///< The content layer (contains game actors)
706 694 ScrollView mScrollView; ///< ScrollView UI Component
707 695 bool mScrolling; ///< ScrollView scrolling state (true = scrolling, false = stationary)
... ...
examples/shader-effect/dissolve-effect-example.cpp
  View file @4d0bd40
... ... @@ -138,7 +138,6 @@ private:
138 138 Toolkit::View mView;
139 139 Toolkit::ToolBar mToolBar;
140 140 Layer mContent;
141   - Toolkit::TextView mTitleActor;
142 141  
143 142 ImageActor mCurrentImage;
144 143 ImageActor mNextImage;
... ... @@ -200,10 +199,7 @@ void DissolveEffectApp::OnInit( Application&amp; application )
200 199 mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
201 200  
202 201 // Add title to the tool bar.
203   - mTitleActor = Toolkit::TextView::New();
204   - mTitleActor.SetText( APPLICATION_TITLE_HIGHP );
205   - mTitleActor.SetStyleToCurrentText(DemoHelper::GetDefaultTextStyle());
206   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
  202 + // TODO
207 203  
208 204 // Add an slide-show button on the right of the title
209 205 mIconPlay = Image::New( PLAY_ICON );
... ... @@ -313,15 +309,12 @@ bool DissolveEffectApp::OnEffectButtonClicked( Toolkit::Button button )
313 309 mCurrentImageEffect = Toolkit::DissolveEffect::New(mUseHighPrecision);
314 310 if(mUseHighPrecision)
315 311 {
316   - mTitleActor.SetText( APPLICATION_TITLE_HIGHP );
317 312 mEffectChangeButton.SetBackgroundImage(mIconHighP);
318 313 }
319 314 else
320 315 {
321   - mTitleActor.SetText( APPLICATION_TITLE_MEDIUMP );
322 316 mEffectChangeButton.SetBackgroundImage(mIconMediumP);
323 317 }
324   - mTitleActor.SetStyleToCurrentText(DemoHelper::GetDefaultTextStyle());
325 318  
326 319 return true;
327 320 }
... ...
examples/shadows/shadow-bone-lighting-example.cpp
  View file @4d0bd40
... ... @@ -34,10 +34,10 @@ const char* gBinaryModelFile = DALI_MODEL_DIR &quot;AlbumCute.dali-bin&quot;;
34 34 const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-default.png" );
35 35 const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );
36 36  
37   -const char* APPLICATION_TITLE_PAN_LIGHT( "Lighting: Pan Light" );
38   -const char* APPLICATION_TITLE_PAN_OBJECT( "Lighting: Pan Object" );
39   -const char* APPLICATION_TITLE_PAN_SCENE( "Lighting: Pan Scene" );
40   -const char* APPLICATION_TITLE_ROTATE_SCENE( "Lighting: Rotate Scene" );
  37 +//const char* APPLICATION_TITLE_PAN_LIGHT( "Lighting: Pan Light" );
  38 +//const char* APPLICATION_TITLE_PAN_OBJECT( "Lighting: Pan Object" );
  39 +//const char* APPLICATION_TITLE_PAN_SCENE( "Lighting: Pan Scene" );
  40 +//const char* APPLICATION_TITLE_ROTATE_SCENE( "Lighting: Rotate Scene" );
41 41 const char* CHANGE_EFFECT_IMAGE( DALI_IMAGE_DIR "icon-change.png" );
42 42 const char* RESET_ICON( DALI_IMAGE_DIR "icon-reset.png" );
43 43  
... ... @@ -155,13 +155,7 @@ public:
155 155 toolBar.AddControl( effectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
156 156  
157 157 // Add title to the tool bar.
158   - mTitleActor = Toolkit::TextView::New();
159   - toolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
160   -
161   - // Set Title text
162   - mTitleActor.SetText( APPLICATION_TITLE_PAN_SCENE );
163   - mTitleActor.SetSize( Font::New().MeasureText( APPLICATION_TITLE_PAN_SCENE ) );
164   - mTitleActor.SetStyleToCurrentText( DemoHelper::GetDefaultTextStyle() );
  158 + // TODO
165 159  
166 160 //Add a reset button
167 161 Image resetImage = Image::New( RESET_ICON );
... ... @@ -264,20 +258,9 @@ public:
264 258 mCastingLight.SetAnchorPoint(AnchorPoint::CENTER);
265 259 mCastingLight.SetPosition( Vector3( 0.0f, 0.0f, 800.0f ) * scaleFactor );
266 260  
267   - TextStyle style;
268   - style.SetFontPointSize( PointSize(DemoHelper::ScalePointSize(20.0f)) );
269   - style.SetFontName("Times New Roman");
270   - style.SetFontStyle("Book");
271   -
272   - TextActorParameters parameters( style, TextActorParameters::FONT_DETECTION_ON );
273   - TextActor text = TextActor::New("Light", parameters);
274   - text.SetColor(Color::BLUE);
275   -
276   - mCastingLight.Add(text);
277 261 mLightAnchor.Add(mCastingLight);
278 262 mShadowPlaneBg.Add(mLightAnchor);
279 263  
280   - text.SetParentOrigin(ParentOrigin::CENTER);
281 264 mShadowView.SetPointLight(mCastingLight);
282 265 }
283 266  
... ... @@ -436,34 +419,6 @@ public:
436 419  
437 420 bool OnEffectButtonClicked( Toolkit::Button button )
438 421 {
439   - switch(mPanState)
440   - {
441   - case PAN_SCENE:
442   - mPanState = ROTATE_SCENE;
443   - mTitleActor.SetText( APPLICATION_TITLE_ROTATE_SCENE );
444   - mTitleActor.SetSize( Font::New().MeasureText( APPLICATION_TITLE_ROTATE_SCENE ) );
445   - break;
446   - case ROTATE_SCENE:
447   - mPanState = PAN_LIGHT;
448   - mTitleActor.SetText( APPLICATION_TITLE_PAN_LIGHT );
449   - mTitleActor.SetSize( Font::New().MeasureText( APPLICATION_TITLE_PAN_LIGHT ) );
450   - break;
451   - case PAN_LIGHT:
452   - mPanState = PAN_OBJECT;
453   - mTitleActor.SetText( APPLICATION_TITLE_PAN_OBJECT );
454   - mTitleActor.SetSize( Font::New().MeasureText( APPLICATION_TITLE_PAN_OBJECT ) );
455   - break;
456   - case PAN_OBJECT:
457   - mPanState = PAN_SCENE;
458   - mTitleActor.SetText( APPLICATION_TITLE_PAN_SCENE );
459   - mTitleActor.SetSize( Font::New().MeasureText( APPLICATION_TITLE_PAN_SCENE ) );
460   - break;
461   - default:
462   - break;
463   - }
464   -
465   - mTitleActor.SetStyleToCurrentText(DemoHelper::GetDefaultTextStyle());
466   -
467 422 return true;
468 423 }
469 424  
... ... @@ -509,8 +464,6 @@ private:
509 464 float mPinchScale;
510 465 float mScaleAtPinchStart;
511 466  
512   - Toolkit::TextView mTitleActor;
513   -
514 467 enum PanState
515 468 {
516 469 PAN_SCENE,
... ...
examples/shared/view.h
  View file @4d0bd40
... ... @@ -45,16 +45,11 @@ const ViewStyle DEFAULT_VIEW_STYLE( 0.1f, 0.7f, 80.f, 4.f );
45 45  
46 46 const char* DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNue");
47 47 const char* DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
48   -const Dali::PointSize DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f );
49   -const Dali::TextStyle::Weight DEFAULT_TEXT_STYLE_WEIGHT(Dali::TextStyle::EXTRALIGHT);
50 48 const Dali::Vector4 DEFAULT_TEXT_STYLE_COLOR(0.0f, 0.0f, 0.0f, 1.0f);
51 49  
52 50 const Dali::Toolkit::Alignment::Padding DEFAULT_PLAY_PADDING(12.0f, 12.0f, 12.0f, 12.0f);
53 51 const Dali::Toolkit::Alignment::Padding DEFAULT_MODE_SWITCH_PADDING(8.0f, 8.0f, 8.0f, 8.0f);
54 52  
55   -static Dali::TextStyle defaultTextStyle;
56   -static bool textStyleSet=false;
57   -
58 53 float ScalePointSize(int pointSize)
59 54 {
60 55 Dali::Vector2 dpi = Dali::Stage::GetCurrent().GetDpi();
... ... @@ -62,26 +57,10 @@ float ScalePointSize(int pointSize)
62 57 return pointSize * 220.0f / meanDpi; // 220 is the default horizontal DPI defined in adaptor Application
63 58 }
64 59  
65   -Dali::TextStyle& GetDefaultTextStyle()
66   -{
67   - if(!textStyleSet)
68   - {
69   - defaultTextStyle.SetFontName(DEFAULT_TEXT_STYLE_FONT_FAMILY);
70   - defaultTextStyle.SetFontStyle(DEFAULT_TEXT_STYLE_FONT_STYLE);
71   - defaultTextStyle.SetFontPointSize(Dali::PointSize(ScalePointSize(DEFAULT_TEXT_STYLE_POINT_SIZE)));
72   - defaultTextStyle.SetWeight(DEFAULT_TEXT_STYLE_WEIGHT);
73   - defaultTextStyle.SetTextColor(DEFAULT_TEXT_STYLE_COLOR);
74   - textStyleSet = true;
75   - }
76   -
77   - return defaultTextStyle;
78   -}
79   -
80 60 Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar& toolBar,
81 61 const std::string& toolbarImagePath,
82 62 const std::string& title,
83   - const ViewStyle& style,
84   - const Dali::TextStyle& textStyle )
  63 + const ViewStyle& style )
85 64 {
86 65 Dali::Layer toolBarLayer = Dali::Layer::New();
87 66 toolBarLayer.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER );
... ... @@ -106,20 +85,10 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar&amp; toolBar,
106 85 // Add the tool bar to the too bar layer.
107 86 toolBarLayer.Add( toolBar );
108 87  
109   - Dali::Font font = Dali::Font::New();
110   -
111 88 // Tool bar text.
112 89 if( !title.empty() )
113 90 {
114   - Dali::Toolkit::TextView titleActor = Dali::Toolkit::TextView::New();
115   - titleActor.SetName( "ToolbarTitle" );
116   - titleActor.SetText( title );
117   - titleActor.SetSize( font.MeasureText( title ) );
118   - titleActor.SetStyleToCurrentText(textStyle);
119   -
120   - // Add title to the tool bar.
121   - const float padding( style.mToolBarPadding );
122   - toolBar.AddControl( titleActor, style.mToolBarTitlePercentage, Dali::Toolkit::Alignment::HorizontalCenter, Dali::Toolkit::Alignment::Padding( padding, padding, padding, padding ) );
  91 + // TODO
123 92 }
124 93  
125 94 return toolBarLayer;
... ... @@ -131,8 +100,7 @@ Dali::Layer CreateView( Dali::Application&amp; application,
131 100 const std::string& backgroundImagePath,
132 101 const std::string& toolbarImagePath,
133 102 const std::string& title,
134   - const ViewStyle& style,
135   - const Dali::TextStyle& textStyle )
  103 + const ViewStyle& style = DEFAULT_VIEW_STYLE )
136 104 {
137 105 Dali::Stage stage = Dali::Stage::GetCurrent();
138 106  
... ... @@ -155,7 +123,7 @@ Dali::Layer CreateView( Dali::Application&amp; application,
155 123 //application.GetOrientation().ChangedSignal().Connect( &view, &Dali::Toolkit::View::OrientationChanged );
156 124  
157 125 // Create default ToolBar
158   - Dali::Layer toolBarLayer = CreateToolbar( toolBar, toolbarImagePath, title, style, textStyle );
  126 + Dali::Layer toolBarLayer = CreateToolbar( toolBar, toolbarImagePath, title, style );
159 127  
160 128 // Add tool bar layer to the view.
161 129 view.AddContentLayer( toolBarLayer );
... ... @@ -173,19 +141,6 @@ Dali::Layer CreateView( Dali::Application&amp; application,
173 141 return contentLayer;
174 142 }
175 143  
176   -Dali::Layer CreateView( Dali::Application& application,
177   - Dali::Toolkit::View& view,
178   - Dali::Toolkit::ToolBar& toolBar,
179   - const std::string& backgroundImagePath,
180   - const std::string& toolbarImagePath,
181   - const std::string& title,
182   - const ViewStyle& style = DEFAULT_VIEW_STYLE )
183   -{
184   - return CreateView( application, view, toolBar, backgroundImagePath, toolbarImagePath, title, style,
185   - GetDefaultTextStyle() );
186   -}
187   -
188   -
189 144 } // DemoHelper
190 145  
191 146 #endif // __DALI_DEMO_HELPER_VIEW_H__
... ...
examples/transition/cube-transition-effect-example.cpp
  View file @4d0bd40
... ... @@ -154,7 +154,6 @@ private:
154 154 Toolkit::View mView;
155 155 Toolkit::ToolBar mToolBar;
156 156 Layer mContent;
157   - Toolkit::TextView mTitleActor;
158 157 Actor mParent;
159 158  
160 159 Vector2 mViewSize;
... ... @@ -217,10 +216,6 @@ void CubeTransitionApp::OnInit( Application&amp; application )
217 216 mEffectChangeButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnEffectButtonClicked );
218 217 mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
219 218  
220   - // Add title to the tool bar.
221   - mTitleActor = Toolkit::TextView::New();
222   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
223   -
224 219 //Add an slideshow icon on the right of the title
225 220 mIconSlideshowStart = Image::New( SLIDE_SHOW_START_ICON );
226 221 mIconSlideshowStop = Image::New( SLIDE_SHOW_STOP_ICON );
... ... @@ -273,11 +268,6 @@ void CubeTransitionApp::OnInit( Application&amp; application )
273 268  
274 269 mCurrentEffect = mCubeWaveEffect;
275 270 mCurrentEffect.SetCurrentImage( mCurrentImage );
276   -
277   - // Set Title text
278   - mTitleActor.SetText( APPLICATION_TITLE_WAVE );
279   - mTitleActor.SetSize( Font::New().MeasureText( APPLICATION_TITLE_WAVE ) );
280   - mTitleActor.SetStyleToCurrentText( DemoHelper::GetDefaultTextStyle() );
281 271 }
282 272  
283 273 // signal handler, called when the pan gesture is detected
... ... @@ -338,26 +328,19 @@ bool CubeTransitionApp::OnEffectButtonClicked( Toolkit::Button button )
338 328 if(mCurrentEffect == mCubeWaveEffect)
339 329 {
340 330 mCurrentEffect = mCubeCrossEffect;
341   - mTitleActor.SetText( APPLICATION_TITLE_CROSS );
342   - mTitleActor.SetSize( Font::New().MeasureText( APPLICATION_TITLE_CROSS ) );
343 331 mEffectChangeButton.SetBackgroundImage(mImageCross);
344 332  
345 333 }
346 334 else if(mCurrentEffect == mCubeCrossEffect)
347 335 {
348 336 mCurrentEffect = mCubeFoldEffect;
349   - mTitleActor.SetText( APPLICATION_TITLE_FOLD );
350   - mTitleActor.SetSize( Font::New().MeasureText( APPLICATION_TITLE_FOLD ) );
351 337 mEffectChangeButton.SetBackgroundImage(mImageFold);
352 338 }
353 339 else
354 340 {
355 341 mCurrentEffect = mCubeWaveEffect;
356   - mTitleActor.SetText( APPLICATION_TITLE_WAVE );
357   - mTitleActor.SetSize( Font::New().MeasureText( APPLICATION_TITLE_WAVE ) );
358 342 mEffectChangeButton.SetBackgroundImage(mImageWave);
359 343 }
360   - mTitleActor.SetStyleToCurrentText(DemoHelper::GetDefaultTextStyle());
361 344  
362 345 // Set the current image to cube transition effect
363 346 // only need to set at beginning or change from another effect
... ...