projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some public Setter/Getter APIs from Dali::Actor
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-Slider.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
index
fcfc821
..
74e5ff1
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-20,7
+20,6
@@
#include <dali-toolkit-test-suite-utils.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali/integration-api/events/touch-event-integ.h>
#include <dali-toolkit-test-suite-utils.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
using namespace Dali;
using namespace Dali::Toolkit;
using namespace Dali;
using namespace Dali::Toolkit;
@@
-130,8
+129,8
@@
int UtcDaliSliderSignals1(void)
// Create the Popup actor
Slider slider = Slider::New();
Stage::GetCurrent().Add( slider );
// Create the Popup actor
Slider slider = Slider::New();
Stage::GetCurrent().Add( slider );
- slider.SetP
arentOrigin(
ParentOrigin::TOP_LEFT);
- slider.Set
AnchorPoint(
ParentOrigin::TOP_LEFT);
+ slider.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::TOP_LEFT);
+ slider.Set
Property( Actor::Property::ANCHOR_POINT,
ParentOrigin::TOP_LEFT);
slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
slider.SetPosition( 0.0f, 0.0f );
slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
slider.SetPosition( 0.0f, 0.0f );
@@
-227,8
+226,8
@@
int UtcDaliSliderSignals2(void)
// Create the Popup actor
Slider slider = Slider::New();
Stage::GetCurrent().Add( slider );
// Create the Popup actor
Slider slider = Slider::New();
Stage::GetCurrent().Add( slider );
- slider.SetP
arentOrigin(
ParentOrigin::TOP_LEFT);
- slider.Set
AnchorPoint(
ParentOrigin::TOP_LEFT);
+ slider.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::TOP_LEFT);
+ slider.Set
Property( Actor::Property::ANCHOR_POINT,
ParentOrigin::TOP_LEFT);
slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
slider.SetPosition( 0.0f, 0.0f );
slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
slider.SetPosition( 0.0f, 0.0f );
@@
-290,8
+289,8
@@
int UtcDaliSetPropertyP(void)
tet_infoline( "UtcDaliSetPropertyP" );
Slider slider = Slider::New();
tet_infoline( "UtcDaliSetPropertyP" );
Slider slider = Slider::New();
- slider.SetP
arentOrigin(
ParentOrigin::TOP_LEFT);
- slider.Set
AnchorPoint(
ParentOrigin::TOP_LEFT);
+ slider.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::TOP_LEFT);
+ slider.Set
Property( Actor::Property::ANCHOR_POINT,
ParentOrigin::TOP_LEFT);
slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
slider.SetPosition( 0.0f, 0.0f );
slider.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
slider.SetPosition( 0.0f, 0.0f );
@@
-333,7
+332,7
@@
int UtcDaliSetPropertyP(void)
{
Property::Map map;
{
Property::Map map;
- map["
rendererType"] = "image
";
+ map["
visualType"] = "IMAGE
";
map["size"] = Vector2(200, 200);
map["url"] = "track2.png";
slider.SetProperty(Slider::Property::TRACK_VISUAL, map);
map["size"] = Vector2(200, 200);
map["url"] = "track2.png";
slider.SetProperty(Slider::Property::TRACK_VISUAL, map);