Removed the DPI hacks

[platform/core/uifw/dali-demo.git] / demo / dali-table-view.cpp

diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index b0376ec..e0e02d7 100644 (file)
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -85,17 +85,15 @@ const Vector2 POSITION_SWING_3DEFFECT( 0.55f, 0.4f );             ///< Position
 const Vector3 ANCHOR_3DEFFECT_STYLE0( -105.0f, 30.0f, -240.0f ); ///< Rotation Anchor position for 3D Effect (Style 0)
 const Vector3 ANCHOR_3DEFFECT_STYLE1( 65.0f, -70.0f, -500.0f );  ///< Rotation Anchor position for 3D Effect (Style 1)
 
-const std::string             DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNeue");
-const std::string             DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
-const Dali::PointSize         DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f );
-const Dali::TextStyle::Weight DEFAULT_TEXT_STYLE_WEIGHT(Dali::TextStyle::REGULAR);
-const Dali::Vector4           DEFAULT_TEXT_STYLE_COLOR(0.7f, 0.7f, 0.7f, 1.0f);
-
-const std::string             TABLE_TEXT_STYLE_FONT_FAMILY("HelveticaNeue");
-const std::string             TABLE_TEXT_STYLE_FONT_STYLE("Regular");
-const Dali::PointSize         TABLE_TEXT_STYLE_POINT_SIZE( 8.0f );
-const Dali::TextStyle::Weight TABLE_TEXT_STYLE_WEIGHT(Dali::TextStyle::LIGHT);
-const Dali::Vector4           TABLE_TEXT_STYLE_COLOR(0.0f, 0.0f, 0.0f, 1.0f);
+//const std::string             DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNeue");
+//const std::string             DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
+//const Dali::Vector4           DEFAULT_TEXT_STYLE_COLOR(0.7f, 0.7f, 0.7f, 1.0f);
+
+//const std::string             TABLE_TEXT_STYLE_FONT_FAMILY("HelveticaNeue");
+//const std::string             TABLE_TEXT_STYLE_FONT_STYLE("Regular");
+//const Dali::PointSize         TABLE_TEXT_STYLE_POINT_SIZE( 8.0f );
+//const Dali::TextStyle::Weight TABLE_TEXT_STYLE_WEIGHT(Dali::TextStyle::LIGHT);
+//const Dali::Vector4           TABLE_TEXT_STYLE_COLOR(0.0f, 0.0f, 0.0f, 1.0f);
 
 Vector3 ScalePointSize(const Vector3& vec)
 {
@@ -104,17 +102,6 @@ Vector3 ScalePointSize(const Vector3& vec)
 
 #define DP(x) DemoHelper::ScalePointSize(x)
 
-TextStyle GetTableTextStyle()
-{
-  TextStyle textStyle;
-  textStyle.SetFontName(TABLE_TEXT_STYLE_FONT_FAMILY);
-  textStyle.SetFontStyle(TABLE_TEXT_STYLE_FONT_STYLE);
-  textStyle.SetFontPointSize( Dali::PointSize(DemoHelper::ScalePointSize(TABLE_TEXT_STYLE_POINT_SIZE)));
-  textStyle.SetWeight(TABLE_TEXT_STYLE_WEIGHT);
-  textStyle.SetTextColor(TABLE_TEXT_STYLE_COLOR);
-  return textStyle;
-}
-
 /**
  * Creates the background image
  */
@@ -231,8 +218,7 @@ void DaliTableView::Initialize( Application& application )
   Dali::Layer toolBarLayer = DemoHelper::CreateToolbar(toolbar,
                                                        DEFAULT_TOOLBAR_IMAGE_PATH,
                                                        DEFAULT_TOOLBAR_TEXT,
-                                                       DemoHelper::DEFAULT_VIEW_STYLE,
-                                                       DemoHelper::GetDefaultTextStyle());
+                                                       DemoHelper::DEFAULT_VIEW_STYLE);
 
   mRootActor.AddChild( toolBarLayer, TableView::CellPosition( 0, 0 ) );
   const float toolbarHeight = DemoHelper::DEFAULT_VIEW_STYLE.mToolBarHeight;
@@ -479,20 +465,16 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
     image.Add( stencil );
   }
 
-  TextView text = TextView::New( title );
-  text.SetAnchorPoint( AnchorPoint::CENTER );
-  text.SetParentOrigin( ParentOrigin::CENTER );
-  text.SetWidthExceedPolicy( Toolkit::TextView::ShrinkToFit );
-  text.SetMultilinePolicy( Toolkit::TextView::SplitByWord );
-  text.SetLineJustification( Toolkit::TextView::Center );
-  text.SetTextAlignment( Toolkit::Alignment::Type( Alignment::HorizontalCenter | Alignment::VerticalCenter ) );
-  text.SetColor( Color::WHITE );
-  text.SetZ( 1 );
-  // make the text 90% of tile
-  text.SetSize( 0.9f * parentSize.width, 0.9f * parentSize.height );
-  text.SetStyleToCurrentText( GetTableTextStyle() );
-  text.SetSnapshotModeEnabled( false );
-  tile.Add( text );
+  TextLabel label = TextLabel::New();
+  label.SetParentOrigin( ParentOrigin::TOP_LEFT );
+  label.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  label.SetProperty( TextLabel::PROPERTY_MULTI_LINE, true );
+  label.SetProperty( TextLabel::PROPERTY_TEXT, title );
+  label.SetColor( Color::BLACK );
+  tile.Add( label );
+
+  // FIXME - This is a kludge because size negotiation is not finished
+  label.SetSize( parentSize );
 
   // Set the tile to be keyboard focusable
   tile.SetKeyboardFocusable(true);