/*
- * Copyright (c) 2015 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.
#include <dali-toolkit/dali-toolkit.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"
namespace
{
- const char* const FOLDER_ICON_IMAGE = DALI_IMAGE_DIR "folder_appicon_empty_bg.png";
- const char* const FOLDER_OPEN_ICON_IMAGE = DALI_IMAGE_DIR "folder_appicon_empty_open_bg.png";
+ const char* const FOLDER_ICON_IMAGE = DEMO_IMAGE_DIR "folder_appicon_empty_bg.png";
+ const char* const FOLDER_OPEN_ICON_IMAGE = DEMO_IMAGE_DIR "folder_appicon_empty_open_bg.png";
const float BORDER_WIDTH = 4.0f;
- const Vector3 POPUP_SIZE_FACTOR_TO_PARENT = Vector3( 0.0, 0.25, 0.0 );
-
} // unnamed namespace
/**
*/
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);
+ 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.SetUnselectedImage( FOLDER_ICON_IMAGE );
- button.SetSelectedImage( FOLDER_OPEN_ICON_IMAGE );
- button.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- button.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
- ResourceImage imageClosed = ResourceImage::New( FOLDER_ICON_IMAGE );
- button.SetSize( imageClosed.GetWidth(), imageClosed.GetHeight() );
-
+ 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 );
- mPopup = CreatePopup( stageSize.width * 0.8f );
+ 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( float width )
+ Popup CreatePopup()
{
Popup popup = Popup::New();
- popup.SetParentOrigin( ParentOrigin::CENTER );
- popup.SetAnchorPoint( AnchorPoint::CENTER );
- popup.SetSize( width, 0.0f );
- popup.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::HEIGHT );
- popup.SetSizeModeFactor( POPUP_SIZE_FACTOR_TO_PARENT );
+ 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.TouchedSignal().Connect( this, &TextFieldExample::OnPopupTouched );
return popup;
{
Property::Value text = mField.GetProperty( TextField::Property::TEXT );
mButtonLabel = text.Get< std::string >();
- mButton.SetLabelText( mButtonLabel );
+ mButton.SetProperty( Toolkit::Button::Property::LABEL, mButtonLabel );
}
// Hide & discard the pop-up
bool OnPopupTouched( Actor actor, const TouchEvent& event )
{
// End edit mode for TextField if parent Popup touched.
- if(event.GetPointCount() > 0)
+ if((event.GetPointCount() > 0) && (mPopup == event.GetHitActor(0)))
{
- const TouchPoint& point = event.GetPoint(0);
- switch(point.state)
+ switch( event.GetState( 0 ) )
{
- case TouchPoint::Down:
+ case PointState::DOWN:
{
// Update the folder text and lose focus for Key events
if( mButton && mField )
{
Property::Value text = mField.GetProperty( TextField::Property::TEXT );
mButtonLabel = text.Get< std::string >();
- mButton.SetLabelText( mButtonLabel );
+ mButton.SetProperty( Toolkit::Button::Property::LABEL, mButtonLabel );
mField.ClearKeyInputFocus();
}
break;
} // end switch
}
- return true;
+ return false;
}
/**
*/
void OnKeyEvent(const KeyEvent& event)
{
- if(event.state == KeyEvent::Down)
+ if(event.GetState() == KeyEvent::DOWN)
{
if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
{
Popup mPopup;
};
-void RunTest( Application& application )
-{
- TextFieldExample test( application );
-
- application.MainLoop();
-}
-
-/** Entry point for Linux & Tizen applications */
-int main( int argc, char **argv )
+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;
}