/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
// EXTERNAL INCLUDES
#include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
#include <dali-toolkit/devel-api/controls/popup/popup.h>
#include <iostream>
*/
void Create( Application& application )
{
- Stage stage = Stage::GetCurrent();
+ Window window = application.GetWindow();
- stage.SetBackgroundColor( Vector4( 0.04f, 0.345f, 0.392f, 1.0f ) );
- stage.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent);
-
- // Hide the indicator bar
- application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+ window.SetBackgroundColor( Vector4( 0.04f, 0.345f, 0.392f, 1.0f ) );
+ window.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent);
mButton = CreateFolderButton();
mButton.ClickedSignal().Connect( this, &TextFieldExample::OnButtonClicked );
- stage.Add( mButton );
+ window.Add( mButton );
}
PushButton CreateFolderButton()
{
PushButton button = PushButton::New();
- button.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, FOLDER_ICON_IMAGE );
- button.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, FOLDER_OPEN_ICON_IMAGE );
- button.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ button.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, FOLDER_ICON_IMAGE );
+ button.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, FOLDER_OPEN_ICON_IMAGE );
+ button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
return button;
}
bool OnButtonClicked( Toolkit::Button button )
{
- Stage stage = Stage::GetCurrent();
- Vector2 stageSize = stage.GetSize();
+ Window window = mApplication.GetWindow();
+ Vector2 windowSize = window.GetSize();
// Remove previously hidden pop-up
UnparentAndReset(mPopup);
// Launch a pop-up containing TextField
- mField = CreateTextField( stageSize, mButtonLabel );
+ mField = CreateTextField( windowSize, mButtonLabel );
mPopup = CreatePopup();
mPopup.Add( mField );
mPopup.OutsideTouchedSignal().Connect( this, &TextFieldExample::OnPopupOutsideTouched );
- stage.Add( mPopup );
+ window.Add( mPopup );
mPopup.SetDisplayState( Popup::SHOWN );
return true;
}
- TextField CreateTextField( const Vector2& stageSize, const std::string& text )
+ TextField CreateTextField( const Vector2& windowSize, const std::string& text )
{
TextField field = TextField::New();
- field.SetName("textField");
- field.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+ field.SetProperty( Dali::Actor::Property::NAME,"textField");
+ field.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
field.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
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::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 ) );
+ field.SetProperty( TextField::Property::DECORATION_BOUNDING_BOX, Rect<int>( BORDER_WIDTH, BORDER_WIDTH, windowSize.width - BORDER_WIDTH*2, windowSize.height - BORDER_WIDTH*2 ) );
return field;
}
Popup CreatePopup()
{
Popup popup = Popup::New();
- popup.SetParentOrigin( ParentOrigin::CENTER );
- popup.SetAnchorPoint( AnchorPoint::CENTER );
+ popup.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+ popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH );
popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT );
popup.TouchSignal().Connect( this, &TextFieldExample::OnPopupTouched );
mField.Reset();
}
- bool OnPopupTouched( Actor actor, const TouchData& event )
+ bool OnPopupTouched( Actor actor, const TouchEvent& event )
{
// End edit mode for TextField if parent Popup touched.
if(event.GetPointCount() > 0)