X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Ftext-field%2Ftext-field-example.cpp;h=751380b9d39473be57e6d97f7325709033117590;hb=1a473d5189ca7e7d55aca3a64a8a4ff2dc3b6c67;hp=89c8b581990e1973b7bbb8e4da075007e21bbdfd;hpb=e86c0caf06d34f4a507903040414f0cb58592f28;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp index 89c8b58..751380b 100644 --- a/examples/text-field/text-field-example.cpp +++ b/examples/text-field/text-field-example.cpp @@ -1,5 +1,5 @@ /* - * 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. @@ -22,7 +22,8 @@ // EXTERNAL INCLUDES #include -#include +#include +#include // INTERNAL INCLUDES #include "shared/multi-language-strings.h" @@ -35,39 +36,11 @@ using namespace MultiLanguageStrings; namespace { - const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "button-up.9.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 unsigned int KEY_ZERO = 10; - const unsigned int KEY_ONE = 11; - const unsigned int KEY_F = 41; - const unsigned int KEY_H = 43; - const unsigned int KEY_V = 55; - const unsigned int KEY_M = 58; - const unsigned int KEY_L = 46; - const unsigned int KEY_S = 39; - const unsigned int KEY_PLUS = 21; - const unsigned int KEY_MINUS = 20; - - const char* H_ALIGNMENT_STRING_TABLE[] = - { - "BEGIN", - "CENTER", - "END" - }; - - const unsigned int H_ALIGNMENT_STRING_COUNT = sizeof( H_ALIGNMENT_STRING_TABLE ) / sizeof( H_ALIGNMENT_STRING_TABLE[0u] ); - - const char* V_ALIGNMENT_STRING_TABLE[] = - { - "TOP", - "CENTER", - "BOTTOM" - }; - - const unsigned int V_ALIGNMENT_STRING_COUNT = sizeof( V_ALIGNMENT_STRING_TABLE ) / sizeof( V_ALIGNMENT_STRING_TABLE[0u] ); - } // unnamed namespace /** @@ -78,9 +51,7 @@ class TextFieldExample : public ConnectionTracker public: TextFieldExample( Application& application ) - : mApplication( application ), - mLanguageId( 0u ), - mAlignment( 0u ) + : mApplication( application ) { // Connect to the Application's Init signal mApplication.InitSignal().Connect( this, &TextFieldExample::Create ); @@ -96,44 +67,117 @@ public: */ void Create( Application& application ) { - DemoHelper::RequestThemeChange(); + Window window = application.GetWindow(); - Stage stage = Stage::GetCurrent(); + window.SetBackgroundColor( Vector4( 0.04f, 0.345f, 0.392f, 1.0f ) ); + window.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent); - mTapGestureDetector = TapGestureDetector::New(); - mTapGestureDetector.Attach( stage.GetRootLayer() ); - mTapGestureDetector.DetectedSignal().Connect( this, &TextFieldExample::OnTap ); + mButton = CreateFolderButton(); + mButton.ClickedSignal().Connect( this, &TextFieldExample::OnButtonClicked ); + window.Add( mButton ); + } - stage.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent); + PushButton CreateFolderButton() + { + PushButton button = PushButton::New(); + 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; + } - Vector2 stageSize = stage.GetSize(); + bool OnButtonClicked( Toolkit::Button button ) + { + Window window = mApplication.GetWindow(); + Vector2 windowSize = window.GetSize(); - Control container = Control::New(); - container.SetName( "Container" ); - container.SetParentOrigin( ParentOrigin::CENTER ); - container.SetSize( Vector2(stageSize.width*0.6f, stageSize.width*0.6f) ); - container.SetBackgroundColor( Color::WHITE ); - container.GetChildAt(0).SetZ(-1.0f); - stage.Add( container ); + // Remove previously hidden pop-up + UnparentAndReset(mPopup); - mField = TextField::New(); - mField.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - mField.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); - mField.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); - mField.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "Unnamed folder" ); - mField.SetProperty( TextField::Property::PLACEHOLDER_TEXT_FOCUSED, "Enter folder name." ); - mField.SetProperty( TextField::Property::DECORATION_BOUNDING_BOX, Rect( BORDER_WIDTH, BORDER_WIDTH, stageSize.width - BORDER_WIDTH*2, stageSize.height - BORDER_WIDTH*2 ) ); + // Launch a pop-up containing TextField + mField = CreateTextField( windowSize, mButtonLabel ); + mPopup = CreatePopup(); + mPopup.Add( mField ); + mPopup.OutsideTouchedSignal().Connect( this, &TextFieldExample::OnPopupOutsideTouched ); + window.Add( mPopup ); + mPopup.SetDisplayState( Popup::SHOWN ); - container.Add( mField ); + return true; + } - Property::Value fieldText = mField.GetProperty( TextField::Property::TEXT ); + TextField CreateTextField( const Vector2& windowSize, const std::string& text ) + { + TextField field = TextField::New(); + 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( BORDER_WIDTH, BORDER_WIDTH, windowSize.width - BORDER_WIDTH*2, windowSize.height - BORDER_WIDTH*2 ) ); + + return field; + } - std::cout << "Displaying text: " << fieldText.Get< std::string >() << std::endl; + Popup CreatePopup() + { + Popup popup = Popup::New(); + 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; } - void OnTap( Actor actor, const TapGesture& tapGesture ) + void OnPopupOutsideTouched() { - mField.ClearKeyInputFocus(); + // Update the folder text + if( mButton && mField ) + { + Property::Value text = mField.GetProperty( TextField::Property::TEXT ); + mButtonLabel = text.Get< std::string >(); + mButton.SetProperty( Toolkit::Button::Property::LABEL, mButtonLabel ); + } + + // Hide & discard the pop-up + if( mPopup ) + { + mPopup.SetDisplayState( Popup::HIDDEN ); + } + mField.Reset(); + } + + bool OnPopupTouched( Actor actor, const TouchEvent& event ) + { + // End edit mode for TextField if parent Popup touched. + if((event.GetPointCount() > 0) && (mPopup == event.GetHitActor(0))) + { + switch( event.GetState( 0 ) ) + { + 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.SetProperty( Toolkit::Button::Property::LABEL, mButtonLabel ); + mField.ClearKeyInputFocus(); + } + break; + } + default: + { + break; + } + } // end switch + } + + return false; } /** @@ -141,79 +185,12 @@ public: */ 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 ) ) { mApplication.Quit(); } - else if( event.IsCtrlModifier() ) - { - switch( event.keyCode ) - { - // Select rendering back-end - case KEY_ZERO: // fall through - case KEY_ONE: - { - mField.SetProperty( TextField::Property::RENDERING_BACKEND, event.keyCode - 10 ); - break; - } - case KEY_H: // Horizontal alignment - { - if( ++mAlignment >= H_ALIGNMENT_STRING_COUNT ) - { - mAlignment = 0u; - } - - mField.SetProperty( TextField::Property::HORIZONTAL_ALIGNMENT, H_ALIGNMENT_STRING_TABLE[ mAlignment ] ); - break; - } - case KEY_V: // Vertical alignment - { - if( ++mAlignment >= V_ALIGNMENT_STRING_COUNT ) - { - mAlignment = 0u; - } - - mField.SetProperty( TextField::Property::VERTICAL_ALIGNMENT, V_ALIGNMENT_STRING_TABLE[ mAlignment ] ); - break; - } - case KEY_L: // Language - { - const Language& language = LANGUAGES[ mLanguageId ]; - - mField.SetProperty( TextField::Property::TEXT, language.text ); - - if( ++mLanguageId >= NUMBER_OF_LANGUAGES ) - { - mLanguageId = 0u; - } - break; - } - case KEY_S: // Shadow color - { - if( Color::BLACK == mField.GetProperty( TextField::Property::SHADOW_COLOR ) ) - { - mField.SetProperty( TextField::Property::SHADOW_COLOR, Color::RED ); - } - else - { - mField.SetProperty( TextField::Property::SHADOW_COLOR, Color::BLACK ); - } - break; - } - case KEY_PLUS: // Increase shadow offset - { - mField.SetProperty( TextField::Property::SHADOW_OFFSET, mField.GetProperty( TextField::Property::SHADOW_OFFSET ) + Vector2( 1.0f, 1.0f ) ); - break; - } - case KEY_MINUS: // Decrease shadow offset - { - mField.SetProperty( TextField::Property::SHADOW_OFFSET, mField.GetProperty( TextField::Property::SHADOW_OFFSET ) - Vector2( 1.0f, 1.0f ) ); - break; - } - } - } } } @@ -221,27 +198,20 @@ private: Application& mApplication; - TextField mField; - - TapGestureDetector mTapGestureDetector; + // This button launches a pop-up containing TextField + PushButton mButton; + std::string mButtonLabel; - unsigned int mLanguageId; - unsigned int mAlignment; + // Pop-up contents + TextField mField; + Popup mPopup; }; -void RunTest( Application& application ) +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 ); TextFieldExample test( application ); - application.MainLoop(); -} - -/** Entry point for Linux & Tizen applications */ -int main( int argc, char **argv ) -{ - Application application = Application::New( &argc, &argv ); - - RunTest( application ); - return 0; }