Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-demo.git] / examples / text-field / text-field-example.cpp

diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp
index 944cb71..9451fdf 100644 (file)
--- a/examples/text-field/text-field-example.cpp
+++ b/examples/text-field/text-field-example.cpp
@@ -25,7 +25,6 @@
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
 #include <dali-toolkit/devel-api/controls/popup/popup.h>
 #include <iostream>
-#include <dali/public-api/events/touch-point.h>
 
 // INTERNAL INCLUDES
 #include "shared/multi-language-strings.h"
@@ -43,8 +42,6 @@ namespace
 
   const float BORDER_WIDTH = 4.0f;
 
-  const Vector3 POPUP_SIZE_FACTOR_TO_PARENT = Vector3( 0.8, 0.25, 0.0 );
-
 } // unnamed namespace
 
 /**
@@ -133,8 +130,8 @@ public:
     Popup popup = Popup::New();
     popup.SetParentOrigin( ParentOrigin::CENTER );
     popup.SetAnchorPoint( AnchorPoint::CENTER );
-    popup.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
-    popup.SetSizeModeFactor( POPUP_SIZE_FACTOR_TO_PARENT );
+    popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH );
+    popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT );
     popup.TouchSignal().Connect( this, &TextFieldExample::OnPopupTouched );
 
     return popup;
@@ -214,20 +211,11 @@ private:
   Popup mPopup;
 };
 
-void RunTest( Application& application )
-{
-  TextFieldExample test( application );
-
-  application.MainLoop();
-}
-
-/** Entry point for Linux & Tizen applications */
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   // DALI_DEMO_THEME_PATH not passed to Application so TextField example uses default Toolkit style sheet.
   Application application = Application::New( &argc, &argv );
-
-  RunTest( application );
-
+  TextFieldExample test( application );
+  application.MainLoop();
   return 0;
 }