/*
- * 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.
void TransitionApplication::Create( Application& application )
{
- Stage stage = Stage::GetCurrent();
- stage.KeyEventSignal().Connect(this, &TransitionApplication::OnKeyEvent);
- stage.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) );
-
- // Hide the indicator bar
- application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+ Window window = application.GetWindow();
+ window.KeyEventSignal().Connect(this, &TransitionApplication::OnKeyEvent);
+ window.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) );
// Content panes:
TableView contentLayout = TableView::New( 4, 1 );
// Assign all rows the size negotiation property of fitting to children
- stage.Add( contentLayout );
+ window.Add( contentLayout );
mTitle = TextLabel::New( "Custom Control Transition Example" );
mTitle.SetProperty( Dali::Actor::Property::NAME, "Title" );
mVisualButtons[i].SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
mVisualButtons[i].SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT );
mVisualIndex = mVisualButtons[i].RegisterProperty( "visualId", i, Property::READ_WRITE );
- mVisualButtons[i].TouchSignal().Connect( this, &TransitionApplication::OnVisualButtonClicked );
+ mVisualButtons[i].TouchedSignal().Connect( this, &TransitionApplication::OnVisualButtonClicked );
visualTypeLayout.AddChild( mVisualButtons[i], TableView::CellPosition( 0, i ) );
}
}
}
-bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchData& touchData )
+bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchEvent& touch )
{
- if( touchData.GetState(0) == PointState::FINISHED )
+ if( touch.GetState(0) == PointState::FINISHED )
{
int visual = actor.GetProperty<int>( mVisualIndex );
Property::Map map;
{
static int keyPressed = 0;
- if( keyEvent.state == KeyEvent::Down)
+ if( keyEvent.GetState() == KeyEvent::DOWN)
{
if( keyPressed == 0 ) // Is this the first down event?
{
- printf("Key pressed: %s %d\n", keyEvent.keyPressedName.c_str(), keyEvent.keyCode );
+ printf("Key pressed: %s %d\n", keyEvent.GetKeyName().c_str(), keyEvent.GetKeyCode() );
if( IsKey( keyEvent, DALI_KEY_ESCAPE) || IsKey( keyEvent, DALI_KEY_BACK ) )
{
mApplication.Quit();
}
- else if( keyEvent.keyPressedName.compare("Return") == 0 )
+ else if( keyEvent.GetKeyName().compare("Return") == 0 )
{
}
}
keyPressed = 1;
}
- else if( keyEvent.state == KeyEvent::Up )
+ else if( keyEvent.GetState() == KeyEvent::UP )
{
keyPressed = 0;
}