Fixed memory leak in text-field demo 68/43868/4
authorPaul Wisbey <p.wisbey@samsung.com>
Mon, 13 Jul 2015 10:09:01 +0000 (11:09 +0100)
committerPaul Wisbey <p.wisbey@samsung.com>
Tue, 14 Jul 2015 18:55:04 +0000 (11:55 -0700)
+ Chose a better cursor color

Change-Id: Ifb6abb311df33c5c30090ecde0a2699035c69fdb

examples/text-field/text-field-example.cpp

index da5d43e..bd00911 100644 (file)
@@ -99,6 +99,9 @@ public:
     Stage stage = Stage::GetCurrent();
     Vector2 stageSize = stage.GetSize();
 
+    // Remove previously hidden pop-up
+    UnparentAndReset(mPopup);
+
     // Launch a pop-up containing TextField
     mField = CreateTextField( stageSize, mButtonLabel );
     mPopup = CreatePopup( stageSize.width * 0.8f );
@@ -117,6 +120,7 @@ public:
     field.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
     field.SetProperty( TextField::Property::TEXT, text );
     field.SetProperty( TextField::Property::TEXT_COLOR, Vector4( 0.0f, 1.0f, 1.0f, 1.0f ) ); // CYAN
+    field.SetProperty( TextField::Property::PRIMARY_CURSOR_COLOR, Color::WHITE );
     field.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "Unnamed folder" );
     field.SetProperty( TextField::Property::PLACEHOLDER_TEXT_FOCUSED, "Enter folder name." );
     field.SetProperty( TextField::Property::DECORATION_BOUNDING_BOX, Rect<int>( BORDER_WIDTH, BORDER_WIDTH, stageSize.width - BORDER_WIDTH*2, stageSize.height - BORDER_WIDTH*2 ) );
@@ -154,7 +158,6 @@ public:
       mPopup.Hide();
     }
     mField.Reset();
-    mPopup.Reset();
   }
 
   bool OnPopupTouched( Actor actor, const TouchEvent& event )