From 4887014555352545a5a66e36674da4d0e3f2da4f Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Mon, 13 Jul 2015 11:09:01 +0100 Subject: [PATCH] Fixed memory leak in text-field demo --- examples/text-field/text-field-example.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp index da5d43e..bd00911 100644 --- a/examples/text-field/text-field-example.cpp +++ b/examples/text-field/text-field-example.cpp @@ -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( 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 ) -- libgit2 0.21.4