From 405f6216e6bb0c6c5e88a809452f5ecf490ea1ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gy=C3=B6rgy=20Straub?= Date: Fri, 28 Aug 2020 10:48:17 +0100 Subject: [PATCH] Renaming of enum values for coding standards compliance. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I7d63afe311fd99b2529928167e864ecda5e2a0ed Signed-off-by: György Straub --- .../dali-toolkit/utc-Dali-AccessibilityManager.cpp | 6 +- .../src/dali-toolkit/utc-Dali-Alignment.cpp | 312 ++++++++++----------- .../src/dali-toolkit/utc-Dali-ImageView.cpp | 2 +- .../src/dali-toolkit/utc-Dali-ScrollBar.cpp | 74 ++--- .../src/dali-toolkit/utc-Dali-ScrollView.cpp | 48 ++-- .../src/dali-toolkit/utc-Dali-ToolBar.cpp | 22 +- .../devel-api/controls/alignment/alignment.h | 34 +-- .../devel-api/controls/scroll-bar/scroll-bar.h | 18 +- .../accessibility-manager-impl.cpp | 4 +- .../internal/controls/alignment/alignment-impl.cpp | 62 ++-- .../controls/scroll-bar/scroll-bar-impl.cpp | 28 +- .../controls/scrollable/item-view/depth-layout.cpp | 4 +- .../controls/scrollable/item-view/grid-layout.cpp | 4 +- .../scrollable/item-view/spiral-layout.cpp | 4 +- .../scroll-overshoot-indicator-impl.cpp | 4 +- .../scrollable/scroll-view/scroll-view-impl.cpp | 40 +-- .../scrollable/scroll-view/scroll-view-impl.h | 10 +- .../controls/text-controls/text-editor-impl.cpp | 4 +- .../text-controls/text-selection-toolbar-impl.cpp | 2 +- .../internal/controls/tool-bar/tool-bar-impl.cpp | 28 +- .../internal/text/decorator/text-decorator.cpp | 20 +- .../internal/text/layouts/layout-engine.cpp | 2 +- dali-toolkit/internal/text/text-controller.cpp | 2 +- .../internal/text/text-enumerations-impl.h | 2 +- .../scrollable/scroll-view/scroll-view.cpp | 14 +- .../controls/scrollable/scroll-view/scroll-view.h | 22 +- 26 files changed, 386 insertions(+), 386 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp index ad275ca..f0dcd1f 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp @@ -2304,7 +2304,7 @@ int UtcDaliAccessibilityManagerHandlePanGesture(void) dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) ); application.GetScene().Add( dummyControl ); - AccessibilityGestureEvent panGestureEvent(AccessibilityGestureEvent::Started); + AccessibilityGestureEvent panGestureEvent(AccessibilityGestureEvent::STARTED); panGestureEvent.previousPosition = Vector2(0.f, 0.f); panGestureEvent.currentPosition = Vector2(100.f, 0.f); panGestureEvent.timeDelta = 16; @@ -2312,12 +2312,12 @@ int UtcDaliAccessibilityManagerHandlePanGesture(void) Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent ); - panGestureEvent.state = AccessibilityGestureEvent::Continuing; + panGestureEvent.state = AccessibilityGestureEvent::CONTINUING; panGestureEvent.previousPosition = Vector2(100.f, 0.f); panGestureEvent.currentPosition = Vector2(200.f, 0.f); Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent ); - panGestureEvent.state = AccessibilityGestureEvent::Finished; + panGestureEvent.state = AccessibilityGestureEvent::FINISHED; panGestureEvent.previousPosition = Vector2(200.f, 0.f); panGestureEvent.currentPosition = Vector2(300.f, 0.f); Test::AccessibilityAdaptor::SendPanGesture( accessibilityAdaptor, panGestureEvent ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp index 6e262eb..bcb4185 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp @@ -121,110 +121,110 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOffStage(void) { ToolkitTestApplication application; - // Default, HorizontalCenter, VerticalCenter - Ensure they do not change! + // Default, HORIZONTAL_CENTER, VERTICAL_CENTER - Ensure they do not change! { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::VerticalCenter)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalLeft, VerticalCenter + // HORIZONTAL_LEFT, VERTICAL_CENTER { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::HorizontalLeft); + Alignment::Type type(Alignment::HORIZONTAL_LEFT); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalRight, VerticalCenter + // HORIZONTAL_RIGHT, VERTICAL_CENTER { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::HorizontalRight); + Alignment::Type type(Alignment::HORIZONTAL_RIGHT); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalLeft, VerticalTop + // HORIZONTAL_LEFT, VERTICAL_TOP { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalTop)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalCenter, VerticalTop + // HORIZONTAL_CENTER, VERTICAL_TOP { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::VerticalTop); + Alignment::Type type(Alignment::VERTICAL_TOP); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalRight, VerticalTop + // HORIZONTAL_RIGHT, VERTICAL_TOP { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalTop)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalLeft, VerticalBottom + // HORIZONTAL_LEFT, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalBottom)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalCenter, VerticalBottom + // HORIZONTAL_CENTER, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::VerticalBottom); + Alignment::Type type(Alignment::VERTICAL_BOTTOM); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalRight, VerticalBottom + // HORIZONTAL_RIGHT, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalBottom)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } @@ -235,7 +235,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { ToolkitTestApplication application; - // Default, HorizontalCenter, VerticalCenter - Ensure they do not change! + // Default, HORIZONTAL_CENTER, VERTICAL_CENTER - Ensure they do not change! { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -244,9 +244,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::VerticalCenter)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); @@ -255,7 +255,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); } - // HorizontalLeft, VerticalCenter + // HORIZONTAL_LEFT, VERTICAL_CENTER { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -264,9 +264,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::HorizontalLeft); + Alignment::Type type(Alignment::HORIZONTAL_LEFT); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); @@ -275,7 +275,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); } - // HorizontalRight, VerticalCenter + // HORIZONTAL_RIGHT, VERTICAL_CENTER { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -284,9 +284,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::HorizontalRight); + Alignment::Type type(Alignment::HORIZONTAL_RIGHT); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); @@ -295,7 +295,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); } - // HorizontalLeft, VerticalTop + // HORIZONTAL_LEFT, VERTICAL_TOP { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -304,9 +304,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalTop)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); @@ -315,7 +315,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); } - // HorizontalCenter, VerticalTop + // HORIZONTAL_CENTER, VERTICAL_TOP { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -324,9 +324,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::VerticalTop); + Alignment::Type type(Alignment::VERTICAL_TOP); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); @@ -335,7 +335,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); } - // HorizontalRight, VerticalTop + // HORIZONTAL_RIGHT, VERTICAL_TOP { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -344,9 +344,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalTop)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); @@ -355,7 +355,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); } - // HorizontalLeft, VerticalBottom + // HORIZONTAL_LEFT, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -364,9 +364,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalBottom)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); @@ -375,7 +375,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); } - // HorizontalCenter, VerticalBottom + // HORIZONTAL_CENTER, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -384,9 +384,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::VerticalBottom); + Alignment::Type type(Alignment::VERTICAL_BOTTOM); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); @@ -395,7 +395,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); } - // HorizontalRight, VerticalBottom + // HORIZONTAL_RIGHT, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -404,9 +404,9 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalBottom)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); @@ -421,45 +421,45 @@ int UtcDaliAlignmentSetAlignmentTypeNegative(void) { ToolkitTestApplication application; - // Setting HorizontalLeft, HorizontalCenter + // Setting HORIZONTAL_LEFT, HORIZONTAL_CENTER { Alignment alignment = Alignment::New(); - Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::HorizontalCenter)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::HORIZONTAL_CENTER)); alignment.SetAlignmentType(type); // center will prevail in conflict - DALI_TEST_CHECK( Alignment::HorizontalCenter & alignment.GetAlignmentType() ); - DALI_TEST_CHECK( !(Alignment::HorizontalLeft & alignment.GetAlignmentType()) ); + DALI_TEST_CHECK( Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::HORIZONTAL_LEFT & alignment.GetAlignmentType()) ); } - // Setting HorizontalCenter, HorizontalRight + // Setting HORIZONTAL_CENTER, HORIZONTAL_RIGHT { Alignment alignment = Alignment::New(); - Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::HorizontalRight)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::HORIZONTAL_RIGHT)); alignment.SetAlignmentType(type); // center will prevail in conflict - DALI_TEST_CHECK( Alignment::HorizontalCenter & alignment.GetAlignmentType() ); - DALI_TEST_CHECK( !(Alignment::HorizontalRight & alignment.GetAlignmentType()) ); + DALI_TEST_CHECK( Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::HORIZONTAL_RIGHT & alignment.GetAlignmentType()) ); } - // Setting VerticalTop, VerticalCenter + // Setting VERTICAL_TOP, VERTICAL_CENTER { Alignment alignment = Alignment::New(); - Alignment::Type type(Alignment::Type(Alignment::VerticalTop | Alignment::VerticalCenter)); + Alignment::Type type(Alignment::Type(Alignment::VERTICAL_TOP | Alignment::VERTICAL_CENTER)); alignment.SetAlignmentType(type); // center will prevail in conflict - DALI_TEST_CHECK( Alignment::VerticalCenter & alignment.GetAlignmentType() ); - DALI_TEST_CHECK( !(Alignment::VerticalTop & alignment.GetAlignmentType()) ); + DALI_TEST_CHECK( Alignment::VERTICAL_CENTER & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::VERTICAL_TOP & alignment.GetAlignmentType()) ); } - // Setting VerticalCenter, VerticalBottom + // Setting VERTICAL_CENTER, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); - Alignment::Type type(Alignment::Type(Alignment::VerticalTop | Alignment::VerticalBottom)); + Alignment::Type type(Alignment::Type(Alignment::VERTICAL_TOP | Alignment::VERTICAL_BOTTOM)); alignment.SetAlignmentType(type); // top will prevail in conflict - DALI_TEST_CHECK( Alignment::VerticalTop & alignment.GetAlignmentType() ); - DALI_TEST_CHECK( !(Alignment::VerticalBottom & alignment.GetAlignmentType()) ); + DALI_TEST_CHECK( Alignment::VERTICAL_TOP & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::VERTICAL_BOTTOM & alignment.GetAlignmentType()) ); } END_TEST; } @@ -468,10 +468,10 @@ int UtcDaliAlignmentGetAlignmentType(void) { ToolkitTestApplication application; - // Default, HorizonalCenter, VerticalCenter + // Default, HorizonalCenter, VERTICAL_CENTER { Alignment alignment = Alignment::New(); - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); application.GetScene().Add(alignment); application.Render(); @@ -481,10 +481,10 @@ int UtcDaliAlignmentGetAlignmentType(void) application.SendNotification(); } - // HorizontalLeft, VerticalCenter + // HORIZONTAL_LEFT, VERTICAL_CENTER { - Alignment alignment = Alignment::New(Alignment::HorizontalLeft); - DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); application.GetScene().Add(alignment); application.Render(); @@ -494,10 +494,10 @@ int UtcDaliAlignmentGetAlignmentType(void) application.SendNotification(); } - // HorizontalRight, VerticalCenter + // HORIZONTAL_RIGHT, VERTICAL_CENTER { - Alignment alignment = Alignment::New(Alignment::HorizontalRight); - DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); application.GetScene().Add(alignment); application.Render(); @@ -507,10 +507,10 @@ int UtcDaliAlignmentGetAlignmentType(void) application.SendNotification(); } - // HorizontalLeft, VerticalTop + // HORIZONTAL_LEFT, VERTICAL_TOP { - Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalTop); - DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT, Alignment::VERTICAL_TOP); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); application.GetScene().Add(alignment); application.Render(); @@ -520,10 +520,10 @@ int UtcDaliAlignmentGetAlignmentType(void) application.SendNotification(); } - // HorizontalCenter, VerticalTop + // HORIZONTAL_CENTER, VERTICAL_TOP { - Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalTop); - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_CENTER, Alignment::VERTICAL_TOP); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); application.GetScene().Add(alignment); application.Render(); @@ -533,10 +533,10 @@ int UtcDaliAlignmentGetAlignmentType(void) application.SendNotification(); } - // HorizontalRight, VerticalTop + // HORIZONTAL_RIGHT, VERTICAL_TOP { - Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalTop); - DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT, Alignment::VERTICAL_TOP); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); application.GetScene().Add(alignment); application.Render(); @@ -546,10 +546,10 @@ int UtcDaliAlignmentGetAlignmentType(void) application.SendNotification(); } - // HorizontalLeft, VerticalBottom + // HORIZONTAL_LEFT, VERTICAL_BOTTOM { - Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalBottom); - DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT, Alignment::VERTICAL_BOTTOM); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); application.GetScene().Add(alignment); application.Render(); @@ -559,10 +559,10 @@ int UtcDaliAlignmentGetAlignmentType(void) application.SendNotification(); } - // HorizontalCenter, VerticalBottom + // HORIZONTAL_CENTER, VERTICAL_BOTTOM { - Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalBottom); - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_CENTER, Alignment::VERTICAL_BOTTOM); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); application.GetScene().Add(alignment); application.Render(); @@ -572,10 +572,10 @@ int UtcDaliAlignmentGetAlignmentType(void) application.SendNotification(); } - // HorizontalRight, VerticalBottom + // HORIZONTAL_RIGHT, VERTICAL_BOTTOM { - Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalBottom); - DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT, Alignment::VERTICAL_BOTTOM); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); application.GetScene().Add(alignment); application.Render(); @@ -591,7 +591,7 @@ int UtcDaliAlignmentSetScaling(void) { ToolkitTestApplication application; - // ScaleToFill + // SCALE_TO_FILL { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -599,23 +599,23 @@ int UtcDaliAlignmentSetScaling(void) application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION); - alignment.SetScaling(Alignment::ScaleToFill); - DALI_TEST_EQUALS(Alignment::ScaleToFill, alignment.GetScaling(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION); + alignment.SetScaling(Alignment::SCALE_TO_FILL); + DALI_TEST_EQUALS(Alignment::SCALE_TO_FILL, alignment.GetScaling(), TEST_LOCATION); application.Render(); application.SendNotification(); // For complete line coverage - alignment.SetAlignmentType(Alignment::HorizontalLeft); + alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::HorizontalRight); + alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalTop); + alignment.SetAlignmentType(Alignment::VERTICAL_TOP); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalBottom); + alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM); application.Render(); application.SendNotification(); @@ -624,7 +624,7 @@ int UtcDaliAlignmentSetScaling(void) application.SendNotification(); } - // ScaleToFitKeepAspect + // SCALE_TO_FIT_KEEP_ASPECT { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -632,23 +632,23 @@ int UtcDaliAlignmentSetScaling(void) application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION); - alignment.SetScaling(Alignment::ScaleToFitKeepAspect); - DALI_TEST_EQUALS(Alignment::ScaleToFitKeepAspect, alignment.GetScaling(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION); + alignment.SetScaling(Alignment::SCALE_TO_FIT_KEEP_ASPECT); + DALI_TEST_EQUALS(Alignment::SCALE_TO_FIT_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION); application.Render(); application.SendNotification(); // For complete line coverage - alignment.SetAlignmentType(Alignment::HorizontalLeft); + alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::HorizontalRight); + alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalTop); + alignment.SetAlignmentType(Alignment::VERTICAL_TOP); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalBottom); + alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM); application.Render(); application.SendNotification(); @@ -657,7 +657,7 @@ int UtcDaliAlignmentSetScaling(void) application.SendNotification(); } - // ScaleToFillKeepAspect + // SCALE_TO_FILL_KEEP_ASPECT { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -665,23 +665,23 @@ int UtcDaliAlignmentSetScaling(void) application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION); - alignment.SetScaling(Alignment::ScaleToFillKeepAspect); - DALI_TEST_EQUALS(Alignment::ScaleToFillKeepAspect, alignment.GetScaling(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION); + alignment.SetScaling(Alignment::SCALE_TO_FILL_KEEP_ASPECT); + DALI_TEST_EQUALS(Alignment::SCALE_TO_FILL_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION); application.Render(); application.SendNotification(); // For complete line coverage - alignment.SetAlignmentType(Alignment::HorizontalLeft); + alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::HorizontalRight); + alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalTop); + alignment.SetAlignmentType(Alignment::VERTICAL_TOP); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalBottom); + alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM); application.Render(); application.SendNotification(); @@ -690,7 +690,7 @@ int UtcDaliAlignmentSetScaling(void) application.SendNotification(); } - // ShrinkToFit + // SHRINK_TO_FIT { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -698,23 +698,23 @@ int UtcDaliAlignmentSetScaling(void) application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION); - alignment.SetScaling(Alignment::ShrinkToFit); - DALI_TEST_EQUALS(Alignment::ShrinkToFit, alignment.GetScaling(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION); + alignment.SetScaling(Alignment::SHRINK_TO_FIT); + DALI_TEST_EQUALS(Alignment::SHRINK_TO_FIT, alignment.GetScaling(), TEST_LOCATION); application.Render(); application.SendNotification(); // For complete line coverage - alignment.SetAlignmentType(Alignment::HorizontalLeft); + alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::HorizontalRight); + alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalTop); + alignment.SetAlignmentType(Alignment::VERTICAL_TOP); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalBottom); + alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM); application.Render(); application.SendNotification(); @@ -723,7 +723,7 @@ int UtcDaliAlignmentSetScaling(void) application.SendNotification(); } - // ShrinkToFitKeepAspect + // SHRINK_TO_FIT_KEEP_ASPECT { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); @@ -731,23 +731,23 @@ int UtcDaliAlignmentSetScaling(void) application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION); - alignment.SetScaling(Alignment::ShrinkToFitKeepAspect); - DALI_TEST_EQUALS(Alignment::ShrinkToFitKeepAspect, alignment.GetScaling(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION); + alignment.SetScaling(Alignment::SHRINK_TO_FIT_KEEP_ASPECT); + DALI_TEST_EQUALS(Alignment::SHRINK_TO_FIT_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION); application.Render(); application.SendNotification(); // For complete line coverage - alignment.SetAlignmentType(Alignment::HorizontalLeft); + alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::HorizontalRight); + alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalTop); + alignment.SetAlignmentType(Alignment::VERTICAL_TOP); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalBottom); + alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM); application.Render(); application.SendNotification(); @@ -762,49 +762,49 @@ int UtcDaliAlignmentGetScaling(void) { ToolkitTestApplication application; - // ScaleToFill + // SCALE_TO_FILL { Alignment alignment = Alignment::New(); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE); - alignment.SetScaling(Alignment::ScaleToFill); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFill); + alignment.SetScaling(Alignment::SCALE_TO_FILL); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FILL); } - // ScaleToFitKeepAspect + // SCALE_TO_FIT_KEEP_ASPECT { Alignment alignment = Alignment::New(); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE); - alignment.SetScaling(Alignment::ScaleToFitKeepAspect); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFitKeepAspect); + alignment.SetScaling(Alignment::SCALE_TO_FIT_KEEP_ASPECT); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FIT_KEEP_ASPECT); } - // ScaleToFillKeepAspect + // SCALE_TO_FILL_KEEP_ASPECT { Alignment alignment = Alignment::New(); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE); - alignment.SetScaling(Alignment::ScaleToFillKeepAspect); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFillKeepAspect); + alignment.SetScaling(Alignment::SCALE_TO_FILL_KEEP_ASPECT); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FILL_KEEP_ASPECT); } - // ShrinkToFit + // SHRINK_TO_FIT { Alignment alignment = Alignment::New(); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE); - alignment.SetScaling(Alignment::ShrinkToFit); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ShrinkToFit); + alignment.SetScaling(Alignment::SHRINK_TO_FIT); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SHRINK_TO_FIT); } - // ShrinkToFitKeepAspect + // SHRINK_TO_FIT_KEEP_ASPECT { Alignment alignment = Alignment::New(); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE); - alignment.SetScaling(Alignment::ShrinkToFitKeepAspect); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ShrinkToFitKeepAspect); + alignment.SetScaling(Alignment::SHRINK_TO_FIT_KEEP_ASPECT); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SHRINK_TO_FIT_KEEP_ASPECT); } END_TEST; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp index 56f7db7..9c461a1 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp @@ -2176,7 +2176,7 @@ int UtcDaliImageViewFittingModesWithAnimatedVectorImageVisual(void) { ToolkitTestApplication application; - tet_infoline( "Create an ImageVisual using ScaleToFill and animated vector image ( image: [600,600], view:[600,600] )" ); + tet_infoline( "Create an ImageVisual using SCALE_TO_FILL and animated vector image ( image: [600,600], view:[600,600] )" ); ImageView imageView = ImageView::New(); Property::Map imageMap; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp index 676bebd..c287c5e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp @@ -189,20 +189,20 @@ int UtcDaliToolkitScrollBarNewP(void) DALI_TEST_CHECK( scrollBar ); END_TEST; - ScrollBar vertical = ScrollBar::New(ScrollBar::Vertical); + ScrollBar vertical = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( vertical ); - DALI_TEST_CHECK( vertical.GetScrollDirection() == ScrollBar::Vertical ); + DALI_TEST_CHECK( vertical.GetScrollDirection() == ScrollBar::VERTICAL ); Property::Value value = vertical.GetProperty(ScrollBar::Property::SCROLL_DIRECTION); std::string scrollDirection = value.Get(); - DALI_TEST_EQUALS( scrollDirection, "Vertical", TEST_LOCATION ); + DALI_TEST_EQUALS( scrollDirection, "VERTICAL", TEST_LOCATION ); - ScrollBar horizontal = ScrollBar::New(ScrollBar::Horizontal); + ScrollBar horizontal = ScrollBar::New(ScrollBar::HORIZONTAL); DALI_TEST_CHECK( horizontal ); - DALI_TEST_CHECK( horizontal.GetScrollDirection() == ScrollBar::Horizontal ); + DALI_TEST_CHECK( horizontal.GetScrollDirection() == ScrollBar::HORIZONTAL ); value = vertical.GetProperty(ScrollBar::Property::SCROLL_DIRECTION); scrollDirection = value.Get(); - DALI_TEST_EQUALS( scrollDirection, "Horizontal", TEST_LOCATION ); + DALI_TEST_EQUALS( scrollDirection, "HORIZONTAL", TEST_LOCATION ); END_TEST; } @@ -223,17 +223,17 @@ int UtcDaliToolkitScrollBarCreateP(void) ScrollBar scrollBar = ScrollBar::DownCast( handle ); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetProperty(ScrollBar::Property::SCROLL_DIRECTION, "Vertical"); - scrollBar.SetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY, "Fixed"); + scrollBar.SetProperty(ScrollBar::Property::SCROLL_DIRECTION, "VERTICAL"); + scrollBar.SetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY, "FIXED"); - DALI_TEST_EQUALS( scrollBar.GetScrollDirection(), Toolkit::ScrollBar::Vertical, TEST_LOCATION ); - DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::Fixed, TEST_LOCATION ); + DALI_TEST_EQUALS( scrollBar.GetScrollDirection(), Toolkit::ScrollBar::VERTICAL, TEST_LOCATION ); + DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::FIXED, TEST_LOCATION ); - scrollBar.SetProperty(ScrollBar::Property::SCROLL_DIRECTION, "Horizontal"); - scrollBar.SetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY, "Variable"); + scrollBar.SetProperty(ScrollBar::Property::SCROLL_DIRECTION, "HORIZONTAL"); + scrollBar.SetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY, "VARIABLE"); - DALI_TEST_EQUALS( scrollBar.GetScrollDirection(), Toolkit::ScrollBar::Horizontal, TEST_LOCATION ); - DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::Variable, TEST_LOCATION ); + DALI_TEST_EQUALS( scrollBar.GetScrollDirection(), Toolkit::ScrollBar::HORIZONTAL, TEST_LOCATION ); + DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::VARIABLE, TEST_LOCATION ); END_TEST; } @@ -271,9 +271,9 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); - DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::Vertical ); + DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::VERTICAL ); float scrollBarHeight = 100.0f; scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, scrollBarHeight, 0.0f) ); @@ -516,7 +516,7 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); @@ -636,7 +636,7 @@ int UtcDaliToolkitScrollBarGetScrollPositionIntervalsP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); // Set the values to get notified when the scroll positions of the source actor goes above or below these values @@ -685,13 +685,13 @@ int UtcDaliToolkitScrollBarGetScrollDirectionP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); - DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::Vertical ); + DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::VERTICAL ); // Change the direction of scroll bar to horizontal - scrollBar.SetScrollDirection(ScrollBar::Horizontal); - DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::Horizontal ); + scrollBar.SetScrollDirection(ScrollBar::HORIZONTAL); + DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::HORIZONTAL ); END_TEST; } @@ -739,11 +739,11 @@ int UtcDaliToolkitScrollBarSetIndicatorHeightPolicyP(void) DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION ); // Set the indicator height to be fixed to 50.0f - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); scrollBar.SetIndicatorFixedHeight(50.0f); Property::Value value = scrollBar.GetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY); - DALI_TEST_EQUALS(value.Get(), "Fixed", TEST_LOCATION ); + DALI_TEST_EQUALS(value.Get(), "FIXED", TEST_LOCATION ); // Render and notify application.SendNotification(); @@ -754,9 +754,9 @@ int UtcDaliToolkitScrollBarSetIndicatorHeightPolicyP(void) DALI_TEST_EQUALS( indicatorHeight, 50.0f, TEST_LOCATION ); // Set the indicator height to be variable - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Variable); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE); value = scrollBar.GetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY); - DALI_TEST_EQUALS(value.Get(), "Variable", TEST_LOCATION ); + DALI_TEST_EQUALS(value.Get(), "VARIABLE", TEST_LOCATION ); // Render and notify application.SendNotification(); @@ -778,12 +778,12 @@ int UtcDaliToolkitScrollBarGetIndicatorHeightPolicyP(void) DALI_TEST_CHECK( scrollBar ); // Set the indicator height to be fixed - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); - DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::Fixed, TEST_LOCATION ); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); + DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::FIXED, TEST_LOCATION ); // Set the indicator height to be variable - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Variable); - DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::Variable, TEST_LOCATION ); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE); + DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::VARIABLE, TEST_LOCATION ); END_TEST; } @@ -804,7 +804,7 @@ int UtcDaliToolkitScrollBarSetIndicatorFixedHeightP(void) DALI_TEST_CHECK( indicator ); // Set the indicator height to be fixed to 50.0f - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); scrollBar.SetIndicatorFixedHeight(50.0f); // Render and notify @@ -1674,7 +1674,7 @@ int UtcDaliToolkitScrollBarPanFinishedSignalP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); @@ -1682,7 +1682,7 @@ int UtcDaliToolkitScrollBarPanFinishedSignalP(void) scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) ); // Set the indicator height to be fixed to 50.0f - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); scrollBar.SetIndicatorFixedHeight(50.0f); application.GetScene().Add( scrollBar ); @@ -1732,7 +1732,7 @@ int UtcDaliToolkitScrollBarPanFinishedSignalN(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); @@ -1740,7 +1740,7 @@ int UtcDaliToolkitScrollBarPanFinishedSignalN(void) scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) ); // Set the indicator height to be fixed to 50.0f - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); scrollBar.SetIndicatorFixedHeight(50.0f); application.GetScene().Add( scrollBar ); @@ -1799,7 +1799,7 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); @@ -1915,7 +1915,7 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalN(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp index 4e050f3..3d4fd83 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp @@ -478,7 +478,7 @@ int UtcDaliToolkitScrollViewScrollToPositionWithDirectionBiasP(void) Wait(application, RENDER_DELAY_SCROLL); DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION ); - scrollView.ScrollTo( target2, 0.25f, Dali::Toolkit::DirectionBiasLeft, Dali::Toolkit::DirectionBiasLeft ); + scrollView.ScrollTo( target2, 0.25f, Dali::Toolkit::DIRECTION_BIAS_LEFT, Dali::Toolkit::DIRECTION_BIAS_LEFT ); Wait(application, RENDER_DELAY_SCROLL); DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION ); @@ -486,7 +486,7 @@ int UtcDaliToolkitScrollViewScrollToPositionWithDirectionBiasP(void) Wait(application, RENDER_DELAY_SCROLL); DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION ); - scrollView.ScrollTo( target2, 0.25f, Dali::Toolkit::DirectionBiasRight, Dali::Toolkit::DirectionBiasRight ); + scrollView.ScrollTo( target2, 0.25f, Dali::Toolkit::DIRECTION_BIAS_RIGHT, Dali::Toolkit::DIRECTION_BIAS_RIGHT ); Wait(application, RENDER_DELAY_SCROLL); DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION ); @@ -547,7 +547,7 @@ int UtcDaliToolkitScrollViewScrollToPositionWithAlphaFunctionAndDirectionBiasP(v Wait(application, RENDER_DELAY_SCROLL); DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION ); - scrollView.ScrollTo( target2, 0.25f, AlphaFunction::LINEAR, Dali::Toolkit::DirectionBiasLeft, Dali::Toolkit::DirectionBiasLeft ); + scrollView.ScrollTo( target2, 0.25f, AlphaFunction::LINEAR, Dali::Toolkit::DIRECTION_BIAS_LEFT, Dali::Toolkit::DIRECTION_BIAS_LEFT ); Wait(application, RENDER_DELAY_SCROLL); DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION ); @@ -555,7 +555,7 @@ int UtcDaliToolkitScrollViewScrollToPositionWithAlphaFunctionAndDirectionBiasP(v Wait(application, RENDER_DELAY_SCROLL); DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION ); - scrollView.ScrollTo( target2, 0.25f, AlphaFunction::LINEAR, Dali::Toolkit::DirectionBiasRight, Dali::Toolkit::DirectionBiasRight ); + scrollView.ScrollTo( target2, 0.25f, AlphaFunction::LINEAR, Dali::Toolkit::DIRECTION_BIAS_RIGHT, Dali::Toolkit::DIRECTION_BIAS_RIGHT ); Wait(application, RENDER_DELAY_SCROLL); DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION ); @@ -563,7 +563,7 @@ int UtcDaliToolkitScrollViewScrollToPositionWithAlphaFunctionAndDirectionBiasP(v Wait(application, RENDER_DELAY_SCROLL); DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target, TEST_LOCATION ); - scrollView.ScrollTo( target2, 0.25f, TestAlphaFunction, Dali::Toolkit::DirectionBiasRight, Dali::Toolkit::DirectionBiasRight ); + scrollView.ScrollTo( target2, 0.25f, TestAlphaFunction, Dali::Toolkit::DIRECTION_BIAS_RIGHT, Dali::Toolkit::DIRECTION_BIAS_RIGHT ); Wait(application, 125); // Check that the scroll animation should finish within just half of the specified duration with the above alpha function DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), target2, TEST_LOCATION ); @@ -881,7 +881,7 @@ int UtcDaliToolkitScrollViewScrollToPageWithDirectionBiasP(void) scrollView.SetWrapMode(true); - scrollView.ScrollTo( 0, 0.25, Dali::Toolkit::DirectionBiasLeft ); + scrollView.ScrollTo( 0, 0.25, Dali::Toolkit::DIRECTION_BIAS_LEFT ); Wait(application, RENDER_FRAME_INTERVAL); // Wait for one frame // Check that the scroll position remains the same @@ -892,7 +892,7 @@ int UtcDaliToolkitScrollViewScrollToPageWithDirectionBiasP(void) DALI_TEST_EQUALS( static_cast(scrollView.GetCurrentPage()), 0, TEST_LOCATION ); DALI_TEST_EQUALS( scrollView.GetCurrentScrollPosition(), Vector2(0.0f, 0.0f), TEST_LOCATION ); - scrollView.ScrollTo( 0, 0.25, Dali::Toolkit::DirectionBiasRight ); + scrollView.ScrollTo( 0, 0.25, Dali::Toolkit::DIRECTION_BIAS_RIGHT ); Wait(application, RENDER_FRAME_INTERVAL); // Wait for one frame // Check that it scrolls towards the right @@ -1410,7 +1410,7 @@ int UtcDaliToolkitScrollViewConstraints(void) Constraint constraint = Constraint::New( scrollView, Actor::Property::POSITION, TestSumConstraint( TEST_CONSTRAINT_OFFSET ) ); constraint.AddSource( Source(scrollView, ScrollView::Property::SCROLL_POSITION) ); - constraint.SetRemoveAction(Constraint::Discard); + constraint.SetRemoveAction(Constraint::DISCARD); scrollView.ApplyConstraintToChildren(constraint); Wait(application); @@ -1457,7 +1457,7 @@ int UtcDaliToolkitScrollViewBind(void) // apply this constraint to scrollview Constraint constraint = Constraint::New( scrollView, Actor::Property::POSITION, TestSumConstraint( TEST_CONSTRAINT_OFFSET ) ); constraint.AddSource( Source(scrollView, ScrollView::Property::SCROLL_POSITION) ); - constraint.SetRemoveAction(Constraint::Discard); + constraint.SetRemoveAction(Constraint::DISCARD); scrollView.ApplyConstraintToChildren(constraint); Wait(application); @@ -1647,13 +1647,13 @@ int UtcDaliToolkitScrollViewSnapStartedSignalP(void) PerformGestureSwipe(application, CLAMP_TOUCH_START, Vector2(0.5f, 0.0f), 60, time, true); DALI_TEST_CHECK( gOnSnapStartCalled ); - DALI_TEST_CHECK( gLastSnapType == Toolkit::Snap ); + DALI_TEST_CHECK( gLastSnapType == Toolkit::SNAP ); // Second try a swipe. PerformGestureSwipe(application, CLAMP_TOUCH_START, Vector2(20.0f, 0.0f), 60, time, true); DALI_TEST_CHECK( gOnSnapStartCalled ); - DALI_TEST_CHECK( gLastSnapType == Toolkit::Flick ); + DALI_TEST_CHECK( gLastSnapType == Toolkit::FLICK ); END_TEST; } @@ -2313,15 +2313,15 @@ int UtcDaliToolkitScrollViewRulerDomainClampWithStateP(void) ClampState clamped; float value = domainX.Clamp(50.0f, 100.0f, 1.0f, clamped); DALI_TEST_EQUALS( value, 50.0f, TEST_LOCATION); - DALI_TEST_EQUALS( clamped, Dali::Toolkit::NotClamped, TEST_LOCATION); + DALI_TEST_EQUALS( clamped, Dali::Toolkit::NOT_CLAMPED, TEST_LOCATION); value = domainX.Clamp(-100.0f, 200.0f, 1.0f, clamped); DALI_TEST_EQUALS( value, 0.0f, TEST_LOCATION); - DALI_TEST_EQUALS( clamped, Dali::Toolkit::ClampedToMin, TEST_LOCATION); + DALI_TEST_EQUALS( clamped, Dali::Toolkit::CLAMPED_TO_MIN, TEST_LOCATION); value = domainX.Clamp(300.0f, 20.0f, 1.0f, clamped); DALI_TEST_EQUALS( value, 180.0f, TEST_LOCATION); - DALI_TEST_EQUALS( clamped, Dali::Toolkit::ClampedToMax, TEST_LOCATION); + DALI_TEST_EQUALS( clamped, Dali::Toolkit::CLAMPED_TO_MAX, TEST_LOCATION); END_TEST; } @@ -2380,11 +2380,11 @@ int UtcDaliToolkitScrollViewRulerGetTypeP(void) RulerPtr defaultRuler = new DefaultRuler(); DALI_TEST_CHECK( defaultRuler ); - DALI_TEST_EQUALS( defaultRuler->GetType(), Dali::Toolkit::Ruler::Free, TEST_LOCATION); + DALI_TEST_EQUALS( defaultRuler->GetType(), Dali::Toolkit::Ruler::FREE, TEST_LOCATION); RulerPtr fixedRuler = new FixedRuler( 100.0f ); DALI_TEST_CHECK( fixedRuler ); - DALI_TEST_EQUALS( fixedRuler->GetType(), Dali::Toolkit::Ruler::Fixed, TEST_LOCATION); + DALI_TEST_EQUALS( fixedRuler->GetType(), Dali::Toolkit::Ruler::FIXED, TEST_LOCATION); END_TEST; } @@ -2481,17 +2481,17 @@ int UtcDaliToolkitScrollViewRulerSnapAndClamp(void) // clamp state testing. ClampState clamped; DALI_TEST_EQUALS( ruler->SnapAndClamp(50.0f, 0.5f, 0.0f, 1.0f, clamped), 50.0f, TEST_LOCATION); - DALI_TEST_EQUALS( clamped, NotClamped, TEST_LOCATION ); + DALI_TEST_EQUALS( clamped, NOT_CLAMPED, TEST_LOCATION ); DALI_TEST_EQUALS( ruler->SnapAndClamp(30.0f, 0.5f, 0.0f, 1.0f, clamped), 50.0f, TEST_LOCATION); - DALI_TEST_EQUALS( clamped, NotClamped, TEST_LOCATION ); + DALI_TEST_EQUALS( clamped, NOT_CLAMPED, TEST_LOCATION ); DALI_TEST_EQUALS( ruler->SnapAndClamp(10.0f, 0.5f, 0.0f, 1.0f, clamped), 0.0f, TEST_LOCATION); - DALI_TEST_EQUALS( clamped, NotClamped, TEST_LOCATION ); + DALI_TEST_EQUALS( clamped, NOT_CLAMPED, TEST_LOCATION ); DALI_TEST_EQUALS( ruler->SnapAndClamp(-40.0f, 0.5f, 0.0f, 1.0f, clamped), 0.0f, TEST_LOCATION); - DALI_TEST_EQUALS( clamped, ClampedToMin, TEST_LOCATION ); + DALI_TEST_EQUALS( clamped, CLAMPED_TO_MIN, TEST_LOCATION ); DALI_TEST_EQUALS( ruler->SnapAndClamp(390.0f, 0.5f, 0.0f, 1.0f, clamped), 400.0f, TEST_LOCATION); - DALI_TEST_EQUALS( clamped, NotClamped, TEST_LOCATION ); + DALI_TEST_EQUALS( clamped, NOT_CLAMPED, TEST_LOCATION ); DALI_TEST_EQUALS( ruler->SnapAndClamp(430.0f, 0.5f, 0.0f, 1.0f, clamped), 400.0f, TEST_LOCATION); - DALI_TEST_EQUALS( clamped, ClampedToMax, TEST_LOCATION ); + DALI_TEST_EQUALS( clamped, CLAMPED_TO_MAX, TEST_LOCATION ); END_TEST; } @@ -2719,7 +2719,7 @@ int UtcDaliToolkitScrollViewConstraintsMove(void) Constraint constraint = Constraint::New( scrollView, Actor::Property::POSITION, MoveActorConstraint ); constraint.AddSource( Source(scrollView, ScrollView::Property::SCROLL_POSITION) ); - constraint.SetRemoveAction(Constraint::Discard); + constraint.SetRemoveAction(Constraint::DISCARD); scrollView.ApplyConstraintToChildren(constraint); scrollView.ScrollTo( target, 0.0f ); @@ -2769,7 +2769,7 @@ int UtcDaliToolkitScrollViewConstraintsWrap(void) constraint.AddSource( Source( scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MIN ) ); constraint.AddSource( Source( scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MAX ) ); constraint.AddSource( Source( scrollView, Toolkit::ScrollView::Property::WRAP ) ); - constraint.SetRemoveAction(Constraint::Discard); + constraint.SetRemoveAction(Constraint::DISCARD); scrollView.ApplyConstraintToChildren(constraint); scrollView.ScrollTo( target, 0.0f ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp index a236bd9..c4777bc 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp @@ -126,10 +126,10 @@ int UtcDaliToolBarAddControl01(void) application.SendNotification(); toolbar.Add( control1 ); - toolbar.AddControl( control2, 0.1f, Alignment::HorizontalLeft, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - toolbar.AddControl( control3, 0.1f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - toolbar.AddControl( control4, 0.1f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - toolbar.AddControl( control5, 0.1f, Alignment::HorizontalRight, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control2, 0.1f, Alignment::HORIZONTAL_LEFT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control3, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control4, 0.1f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control5, 0.1f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); Actor control6 = CreateColorActor( Color::RED ); control6.SetProperty( Actor::Property::SIZE, Vector2( 100.f, 100.f ) ); @@ -143,9 +143,9 @@ int UtcDaliToolBarAddControl01(void) application.Render(); application.SendNotification(); - toolbar.AddControl( control6, 0.4f, Alignment::HorizontalLeft, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - toolbar.AddControl( control7, 0.2f, Alignment::HorizontalCenter, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); - toolbar.AddControl( control8, 0.2f, Alignment::HorizontalRight, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control6, 0.4f, Alignment::HORIZONTAL_LEFT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control7, 0.2f, Alignment::HORIZONTAL_CENTER, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); + toolbar.AddControl( control8, 0.2f, Alignment::HORIZONTAL_RIGHT, Alignment::Padding( 1.f, 1.f, 1.f, 1.f ) ); } catch( ... ) { @@ -198,7 +198,7 @@ int UtcDaliToolBarRemoveControl01(void) Actor control = CreateColorActor( Color::RED ); ToolBar toolbar = ToolBar::New(); - toolbar.AddControl( control, 0.1f, Alignment::HorizontalLeft ); + toolbar.AddControl( control, 0.1f, Alignment::HORIZONTAL_LEFT ); toolbar.RemoveControl( control ); } @@ -223,8 +223,8 @@ int UtcDaliToolBarRemoveControl02(void) ToolBar toolbar01 = ToolBar::New(); ToolBar toolbar02 = ToolBar::New(); - toolbar01.AddControl( control01, 0.1f, Alignment::HorizontalLeft ); - toolbar02.AddControl( control02, 0.1f, Alignment::HorizontalLeft ); + toolbar01.AddControl( control01, 0.1f, Alignment::HORIZONTAL_LEFT ); + toolbar02.AddControl( control02, 0.1f, Alignment::HORIZONTAL_LEFT ); toolbar02.RemoveControl( control01 ); } @@ -243,7 +243,7 @@ int UtcDaliToolBarRemoveControl02(void) Actor control = CreateColorActor( Color::RED ); ToolBar toolbar = ToolBar::New(); - toolbar.AddControl( control, 0.1f, Alignment::HorizontalLeft ); + toolbar.AddControl( control, 0.1f, Alignment::HORIZONTAL_LEFT ); toolbar.RemoveControl( control ); toolbar.RemoveControl( control ); diff --git a/dali-toolkit/devel-api/controls/alignment/alignment.h b/dali-toolkit/devel-api/controls/alignment/alignment.h index 116f658..337f01a 100644 --- a/dali-toolkit/devel-api/controls/alignment/alignment.h +++ b/dali-toolkit/devel-api/controls/alignment/alignment.h @@ -44,7 +44,7 @@ class Alignment; * @note The use of scaling property will override all constraints applied to actors. * * All actors added to an alignment are going to be set with the same anchor point and parent origin. And if the scaling property is set to a value - * different than ScaleNone, constraints as well. + * different than SCALE_NONE, constraints as well. */ class DALI_TOOLKIT_API Alignment : public Control { @@ -55,12 +55,12 @@ public: */ enum Type { - HorizontalLeft = 1, ///< Horizontal left alignment @SINCE_1_0.0 - HorizontalCenter = 2, ///< Horizontal center alignment @SINCE_1_0.0 - HorizontalRight = 4, ///< Horizontal right alignment @SINCE_1_0.0 - VerticalTop = 8, ///< Vertical top alignment @SINCE_1_0.0 - VerticalCenter = 16, ///< Vertical center alignment @SINCE_1_0.0 - VerticalBottom = 32 ///< Vertical bottom alignment @SINCE_1_0.0 + HORIZONTAL_LEFT = 1, ///< HORIZONTAL left alignment @SINCE_1_9.28 + HORIZONTAL_CENTER = 2, ///< HORIZONTAL center alignment @SINCE_1_9.28 + HORIZONTAL_RIGHT = 4, ///< HORIZONTAL right alignment @SINCE_1_9.28 + VERTICAL_TOP = 8, ///< VERTICAL top alignment @SINCE_1_9.28 + VERTICAL_CENTER = 16, ///< VERTICAL center alignment @SINCE_1_9.28 + VERTICAL_BOTTOM = 32 ///< VERTICAL bottom alignment @SINCE_1_9.28 }; /** @@ -69,12 +69,12 @@ public: */ enum Scaling { - ScaleNone, ///< The original size is kept. @SINCE_1_0.0 - ScaleToFill, ///< Scale added actors to fill alignment's boundary. Aspect ratio is not maintained. @SINCE_1_0.0 - ScaleToFitKeepAspect, ///< Scale added actors to fit within the alignment's boundary. Aspect ratio is maintained. @SINCE_1_0.0 - ScaleToFillKeepAspect, ///< Scale added actors to fill the alignment's boundary. Aspect ratio is maintained, and the actor may exceed the alignment's boundary. @SINCE_1_0.0 - ShrinkToFit, ///< If added actors are larger than the alignment's boundary it will be shrunk down to fit. Aspect ratio is not maintained @SINCE_1_0.0 - ShrinkToFitKeepAspect, ///< If added actors are larger than the alignment's boundary it will be shrunk down to fit. Aspect ratio is maintained @SINCE_1_0.0 + SCALE_NONE, ///< The original size is kept. @SINCE_1_9.28 + SCALE_TO_FILL, ///< Scale added actors to fill alignment's boundary. Aspect ratio is not maintained. @SINCE_1_9.28 + SCALE_TO_FIT_KEEP_ASPECT, ///< Scale added actors to fit within the alignment's boundary. Aspect ratio is maintained. @SINCE_1_9.28 + SCALE_TO_FILL_KEEP_ASPECT, ///< Scale added actors to fill the alignment's boundary. Aspect ratio is maintained, and the actor may exceed the alignment's boundary. @SINCE_1_9.28 + SHRINK_TO_FIT, ///< If added actors are larger than the alignment's boundary it will be shrunk down to fit. Aspect ratio is not maintained @SINCE_1_9.28 + SHRINK_TO_FIT_KEEP_ASPECT, ///< If added actors are larger than the alignment's boundary it will be shrunk down to fit. Aspect ratio is maintained @SINCE_1_9.28 }; /** @@ -130,11 +130,11 @@ public: * @brief Creates an alignment control. * * @SINCE_1_0.0 - * @param[in] horizontal Specifies how to align actors horizontally. Could be HorizontalLeft, HorizontalCenter or HorizontalRight. By default, HorizontalCenter - * @param[in] vertical Specifies how to align actors vertically. Could be VerticalTop, VerticalCenter or VerticalBottom. By default, VerticalCenter + * @param[in] horizontal Specifies how to align actors horizontally. Could be HORIZONTAL_LEFT, HORIZONTAL_CENTER or HORIZONTAL_RIGHT. By default, HORIZONTAL_CENTER + * @param[in] vertical Specifies how to align actors vertically. Could be VERTICAL_TOP, VERTICAL_CENTER or VERTICAL_BOTTOM. By default, VERTICAL_CENTER * @return A handle to the Alignment control */ - static Alignment New( Type horizontal = HorizontalCenter, Type vertical = VerticalCenter ); + static Alignment New( Type horizontal = HORIZONTAL_CENTER, Type vertical = VERTICAL_CENTER ); /** * @brief Copy constructor. Creates another handle that points to the same real object. @@ -165,7 +165,7 @@ public: static Alignment DownCast( BaseHandle handle ); /** - * @brief Sets the new alignment. By default, ( HorizontalCenter | VerticalCenter ). + * @brief Sets the new alignment. By default, ( HORIZONTAL_CENTER | VERTICAL_CENTER ). * * @SINCE_1_0.0 * @param[in] type The new alignment option diff --git a/dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h b/dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h index d988212..fa6c67d 100755 --- a/dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h +++ b/dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h @@ -80,7 +80,7 @@ public: /** * @brief The scrolling direction of the indicator. * @details Name "scrollDirection", type Property::STRING. - * Possible values are "Vertical" and "Horizontal". + * Possible values are "VERTICAL" and "HORIZONTAL". * @SINCE_1_0.0 * @see SetScrollDirection() */ @@ -89,7 +89,7 @@ public: /** * @brief The indicator height policy. * @details Name "indicatorHeightPolicy", type Property::STRING. - * Possible values are "Variable" and "Fixed". + * Possible values are "VARIABLE" and "FIXED". * @SINCE_1_0.0 * @see SetIndicatorHeightPolicy() */ @@ -137,7 +137,7 @@ public: /** * @brief The padding at the start of the indicator. * @details Name "indicatorStartPadding", type Property::FLOAT. - * For example, the padding at the top if scrollDirection is Vertical. + * For example, the padding at the top if scrollDirection is VERTICAL. * @SINCE_1_1.36 */ INDICATOR_START_PADDING, @@ -145,7 +145,7 @@ public: /** * @brief The padding at the end of the indicator. * @details Name "indicatorEndPadding", type Property::FLOAT. - * For example, the padding at the bottom if scrollDirection is Vertical. + * For example, the padding at the bottom if scrollDirection is VERTICAL. * @SINCE_1_1.36 */ INDICATOR_END_PADDING, @@ -172,8 +172,8 @@ public: */ enum Direction { - Vertical = 0, ///< Scroll in the vertical direction @SINCE_1_0.0 - Horizontal ///< Scroll in the horizontal direction @SINCE_1_0.0 + VERTICAL = 0, ///< Scroll in the vertical direction @SINCE_1_9.28 + HORIZONTAL ///< Scroll in the horizontal direction @SINCE_1_9.28 }; /** @@ -182,8 +182,8 @@ public: */ enum IndicatorHeightPolicy { - Variable = 0, ///< Variable height changed dynamically according to the length of scroll content @SINCE_1_0.0 - Fixed ///< Fixed height regardless of the length of scroll content @SINCE_1_0.0 + VARIABLE = 0, ///< VARIABLE height changed dynamically according to the length of scroll content @SINCE_1_9.28 + FIXED ///< FIXED height regardless of the length of scroll content @SINCE_1_9.28 }; /** @@ -222,7 +222,7 @@ public: * @param[in] direction The direction of scroll bar (either vertically or horizontally) * @return A pointer to the created ScrollBar */ - static ScrollBar New(Direction direction = Vertical); + static ScrollBar New(Direction direction = VERTICAL); /** * @brief Downcasts a handle to ScrollBar handle. diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp index 053cb96..2a6484b 100644 --- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp +++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp @@ -1306,7 +1306,7 @@ bool AccessibilityManager::HandlePanGesture(const AccessibilityGestureEvent& pan { bool handled = false; - if( panEvent.state == AccessibilityGestureEvent::Started ) + if( panEvent.state == AccessibilityGestureEvent::STARTED ) { // Find the focusable actor at the event position Dali::HitTestAlgorithm::Results results; @@ -1323,7 +1323,7 @@ bool AccessibilityManager::HandlePanGesture(const AccessibilityGestureEvent& pan // Gesture::Finished (Up) events are delivered with previous (Motion) event position // Use the real previous position; otherwise we may incorrectly get a ZERO velocity - if ( AccessibilityGestureEvent::Finished != panEvent.state ) + if ( AccessibilityGestureEvent::FINISHED != panEvent.state ) { // Store the previous position for next Gesture::Finished iteration. mPreviousPosition = panEvent.previousPosition; diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp index 8000612..2500b0e 100644 --- a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp +++ b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp @@ -59,17 +59,17 @@ inline Vector3 GetPosition( const Toolkit::Alignment::Padding& padding, Toolkit: switch( horizontalAlignment ) { - case Dali::Toolkit::Alignment::HorizontalLeft: + case Dali::Toolkit::Alignment::HORIZONTAL_LEFT: { position.x += padding.left; break; } - case Dali::Toolkit::Alignment::HorizontalRight: + case Dali::Toolkit::Alignment::HORIZONTAL_RIGHT: { position.x -= padding.right; break; } - case Dali::Toolkit::Alignment::HorizontalCenter: // FALLTHROUGH + case Dali::Toolkit::Alignment::HORIZONTAL_CENTER: // FALLTHROUGH default: // use center as default { if( currentSize.width + padding.left + padding.right >= parentSize.width ) @@ -82,17 +82,17 @@ inline Vector3 GetPosition( const Toolkit::Alignment::Padding& padding, Toolkit: switch( verticalAlignment ) { - case Dali::Toolkit::Alignment::VerticalTop: + case Dali::Toolkit::Alignment::VERTICAL_TOP: { position.y += padding.top; break; } - case Dali::Toolkit::Alignment::VerticalBottom: + case Dali::Toolkit::Alignment::VERTICAL_BOTTOM: { position.y -= padding.bottom; break; } - case Dali::Toolkit::Alignment::VerticalCenter: // FALLTHROUGH + case Dali::Toolkit::Alignment::VERTICAL_CENTER: // FALLTHROUGH default: // use center as default { if( currentSize.height + padding.top + padding.bottom >= parentSize.height ) @@ -126,31 +126,31 @@ Toolkit::Alignment Alignment::New( Toolkit::Alignment::Type horizontal, Toolkit: void Alignment::SetAlignmentType( Toolkit::Alignment::Type type ) { // Horizontal Alignment - if( type & Toolkit::Alignment::HorizontalRight ) + if( type & Toolkit::Alignment::HORIZONTAL_RIGHT ) { - mHorizontal = Toolkit::Alignment::HorizontalRight; + mHorizontal = Toolkit::Alignment::HORIZONTAL_RIGHT; } - if( type & Toolkit::Alignment::HorizontalLeft ) + if( type & Toolkit::Alignment::HORIZONTAL_LEFT ) { - mHorizontal = Toolkit::Alignment::HorizontalLeft; + mHorizontal = Toolkit::Alignment::HORIZONTAL_LEFT; } - if( type & Toolkit::Alignment::HorizontalCenter ) + if( type & Toolkit::Alignment::HORIZONTAL_CENTER ) { - mHorizontal = Toolkit::Alignment::HorizontalCenter; + mHorizontal = Toolkit::Alignment::HORIZONTAL_CENTER; } // Vertical Alignment - if( type & Toolkit::Alignment::VerticalBottom ) + if( type & Toolkit::Alignment::VERTICAL_BOTTOM ) { - mVertical = Toolkit::Alignment::VerticalBottom; + mVertical = Toolkit::Alignment::VERTICAL_BOTTOM; } - if( type & Toolkit::Alignment::VerticalTop ) + if( type & Toolkit::Alignment::VERTICAL_TOP ) { - mVertical = Toolkit::Alignment::VerticalTop; + mVertical = Toolkit::Alignment::VERTICAL_TOP; } - if( type & Toolkit::Alignment::VerticalCenter ) + if( type & Toolkit::Alignment::VERTICAL_CENTER ) { - mVertical = Toolkit::Alignment::VerticalCenter; + mVertical = Toolkit::Alignment::VERTICAL_CENTER; } RelayoutRequest(); @@ -192,21 +192,21 @@ void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container ) // lay out the actors Vector3 anchorPointAndParentOrigin = Vector3::ZERO; anchorPointAndParentOrigin.z = 0.5f; - // anchorPoint.x is initialized to 0.0, which is HorizontalLeft - if( Toolkit::Alignment::HorizontalCenter == mHorizontal ) + // anchorPoint.x is initialized to 0.0, which is HORIZONTAL_LEFT + if( Toolkit::Alignment::HORIZONTAL_CENTER == mHorizontal ) { anchorPointAndParentOrigin.x = 0.5f; } - else if( Toolkit::Alignment::HorizontalRight == mHorizontal ) + else if( Toolkit::Alignment::HORIZONTAL_RIGHT == mHorizontal ) { anchorPointAndParentOrigin.x = 1.0f; } - // anchorPoint.y is initialized to 0.0, which is VerticalTop - if( Toolkit::Alignment::VerticalCenter == mVertical ) + // anchorPoint.y is initialized to 0.0, which is VERTICAL_TOP + if( Toolkit::Alignment::VERTICAL_CENTER == mVertical ) { anchorPointAndParentOrigin.y = 0.5f; } - else if( Toolkit::Alignment::VerticalBottom == mVertical ) + else if( Toolkit::Alignment::VERTICAL_BOTTOM == mVertical ) { anchorPointAndParentOrigin.y = 1.0f; } @@ -236,33 +236,33 @@ void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container ) // no point trying to squeeze actors into too small size switch( mScaling ) { - case Toolkit::Alignment::ScaleNone: + case Toolkit::Alignment::SCALE_NONE: { // Nothing to do renegotiate = false; break; } - case Toolkit::Alignment::ScaleToFill: + case Toolkit::Alignment::SCALE_TO_FILL: { // Nothing to do, newChildSize is already full size minus padding break; } - case Toolkit::Alignment::ScaleToFitKeepAspect: + case Toolkit::Alignment::SCALE_TO_FIT_KEEP_ASPECT: { newChildSize = currentChildSize * std::min( ( newChildSize.width / currentChildSize.width ), ( newChildSize.height / currentChildSize.height ) ); break; } - case Toolkit::Alignment::ScaleToFillKeepAspect: + case Toolkit::Alignment::SCALE_TO_FILL_KEEP_ASPECT: { newChildSize = currentChildSize * std::max( ( newChildSize.width / currentChildSize.width ), ( newChildSize.height / currentChildSize.height ) ); break; } - case Toolkit::Alignment::ShrinkToFit: + case Toolkit::Alignment::SHRINK_TO_FIT: { newChildSize = Vector2( std::min( newChildSize.width, currentChildSize.width ), std::min( newChildSize.height, currentChildSize.height ) ); break; } - case Toolkit::Alignment::ShrinkToFitKeepAspect: + case Toolkit::Alignment::SHRINK_TO_FIT_KEEP_ASPECT: { // check source size vs target size to see if we need to shrink float widthScale = ( newChildSize.width < currentChildSize.width ) ? (newChildSize.width / currentChildSize.width) : 1.f; @@ -293,7 +293,7 @@ Alignment::Alignment( Toolkit::Alignment::Type horizontal, Toolkit::Alignment::T : Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mHorizontal( horizontal ), mVertical( vertical ), - mScaling( Toolkit::Alignment::ScaleNone ), + mScaling( Toolkit::Alignment::SCALE_NONE ), mPadding( 0.f, 0.f, 0.f, 0.f ) { } diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp index 7056b0c..c4b2581 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -177,8 +177,8 @@ DALI_ACTION_REGISTRATION( Toolkit, ScrollBar, "ShowTransientIndicator", DALI_TYPE_REGISTRATION_END() -const char* SCROLL_DIRECTION_NAME[] = {"Vertical", "Horizontal"}; -const char* INDICATOR_HEIGHT_POLICY_NAME[] = {"Variable", "Fixed"}; +const char* SCROLL_DIRECTION_NAME[] = {"VERTICAL", "HORIZONTAL"}; +const char* INDICATOR_HEIGHT_POLICY_NAME[] = {"VARIABLE", "FIXED"}; } @@ -197,7 +197,7 @@ ScrollBar::ScrollBar(Toolkit::ScrollBar::Direction direction) mScrollStart(0.0f), mGestureDisplacement( Vector3::ZERO ), mCurrentScrollPosition(0.0f), - mIndicatorHeightPolicy(Toolkit::ScrollBar::Variable), + mIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE), mIndicatorFixedHeight(DEFAULT_INDICATOR_FIXED_HEIGHT), mIndicatorMinimumHeight(DEFAULT_INDICATOR_MINIMUM_HEIGHT), mIndicatorStartPadding(DEFAULT_INDICATOR_START_PADDING), @@ -304,7 +304,7 @@ void ScrollBar::ApplyConstraints() } // Set indicator height according to the indicator's height policy - if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed) + if(mIndicatorHeightPolicy == Toolkit::ScrollBar::FIXED) { mIndicator.SetProperty( Actor::Property::SIZE, Vector2( Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight) ); } @@ -529,7 +529,7 @@ void ScrollBar::OnPan( const PanGesture& gesture ) void ScrollBar::OnSizeSet( const Vector3& size ) { - if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed) + if(mIndicatorHeightPolicy == Toolkit::ScrollBar::FIXED) { mIndicator.SetProperty( Actor::Property::SIZE, Vector2( size.width, mIndicatorFixedHeight ) ); } @@ -565,7 +565,7 @@ void ScrollBar::SetIndicatorFixedHeight( float height ) { mIndicatorFixedHeight = height; - if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed) + if(mIndicatorHeightPolicy == Toolkit::ScrollBar::FIXED) { mIndicator.SetProperty( Actor::Property::SIZE, Vector2( Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight) ); } @@ -599,13 +599,13 @@ float ScrollBar::GetIndicatorHideDuration() const void ScrollBar::OnScrollDirectionPropertySet( Property::Value propertyValue ) { std::string directionName( propertyValue.Get() ); - if(directionName == "Vertical") + if(directionName == "VERTICAL") { - SetScrollDirection(Toolkit::ScrollBar::Vertical); + SetScrollDirection(Toolkit::ScrollBar::VERTICAL); } - else if(directionName == "Horizontal") + else if(directionName == "HORIZONTAL") { - SetScrollDirection(Toolkit::ScrollBar::Horizontal); + SetScrollDirection(Toolkit::ScrollBar::HORIZONTAL); } else { @@ -616,13 +616,13 @@ void ScrollBar::OnScrollDirectionPropertySet( Property::Value propertyValue ) void ScrollBar::OnIndicatorHeightPolicyPropertySet( Property::Value propertyValue ) { std::string policyName( propertyValue.Get() ); - if(policyName == "Variable") + if(policyName == "VARIABLE") { - SetIndicatorHeightPolicy(Toolkit::ScrollBar::Variable); + SetIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE); } - else if(policyName == "Fixed") + else if(policyName == "FIXED") { - SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); + SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); } else { diff --git a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp index 58731c8..da233b8 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp @@ -490,13 +490,13 @@ void DepthLayout::ApplyConstraints( Actor& actor, const int itemId, const Vector // Color constraint constraint = Constraint::New< Vector4 >( actor, Actor::Property::COLOR, DepthColorConstraint( itemId, mImpl->mNumberOfColumns, mImpl->mNumberOfRows*0.5f, itemId % mImpl->mNumberOfColumns ) ); constraint.AddSource( ParentSource( Toolkit::ItemView::Property::LAYOUT_POSITION ) ); - constraint.SetRemoveAction( Dali::Constraint::Discard ); + constraint.SetRemoveAction( Dali::Constraint::DISCARD ); constraint.Apply(); // Visibility constraint constraint = Constraint::New< bool >( actor, Actor::Property::VISIBLE, DepthVisibilityConstraint( itemId, mImpl->mNumberOfColumns, mImpl->mNumberOfRows*0.5f, itemId % mImpl->mNumberOfColumns ) ); constraint.AddSource( ParentSource( Toolkit::ItemView::Property::LAYOUT_POSITION ) ); - constraint.SetRemoveAction( Dali::Constraint::Discard ); + constraint.SetRemoveAction( Dali::Constraint::DISCARD ); constraint.Apply(); } } diff --git a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp index 3e28d80..435cbf3 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.cpp @@ -596,7 +596,7 @@ void GridLayout::ApplyConstraints( Actor& actor, const int itemId, const Vector3 // Color constraint constraint = Constraint::New< Vector4 >( actor, Actor::Property::COLOR, &GridColorConstraint ); - constraint.SetRemoveAction( Dali::Constraint::Discard ); + constraint.SetRemoveAction( Dali::Constraint::DISCARD ); constraint.Apply(); // Visibility constraint @@ -617,7 +617,7 @@ void GridLayout::ApplyConstraints( Actor& actor, const int itemId, const Vector3 } constraint.AddSource( ParentSource( Toolkit::ItemView::Property::LAYOUT_POSITION ) ); constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.SetRemoveAction( Dali::Constraint::Discard ); + constraint.SetRemoveAction( Dali::Constraint::DISCARD ); constraint.Apply(); } } diff --git a/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.cpp b/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.cpp index 94bf0d6..9121ebe 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.cpp @@ -480,7 +480,7 @@ void SpiralLayout::ApplyConstraints( Actor& actor, const int itemId, const Vecto // Color constraint constraint = Constraint::New< Vector4 >( actor, Actor::Property::COLOR, SpiralColorConstraint( itemId, mImpl->mItemSpacingRadians ) ); constraint.AddSource( ParentSource( Toolkit::ItemView::Property::LAYOUT_POSITION ) ); - constraint.SetRemoveAction(Dali::Constraint::Discard); + constraint.SetRemoveAction(Dali::Constraint::DISCARD); constraint.Apply(); // Visibility constraint @@ -495,7 +495,7 @@ void SpiralLayout::ApplyConstraints( Actor& actor, const int itemId, const Vecto } constraint.AddSource( ParentSource( Toolkit::ItemView::Property::LAYOUT_POSITION ) ); constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.SetRemoveAction(Dali::Constraint::Discard); + constraint.SetRemoveAction(Dali::Constraint::DISCARD); constraint.Apply(); } } diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp index 112b317..c02c7ec 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp @@ -197,7 +197,7 @@ void ScrollOvershootEffectRipple::UpdatePropertyNotifications() increaseStep = MAX_OVERSHOOT_NOTIFY_AMOUNT; } mOvershootIncreaseNotification = self.AddPropertyNotification( mOvershootProperty, OutsideCondition(-increaseStep, increaseStep) ); - mOvershootIncreaseNotification.SetNotifyMode(PropertyNotification::NotifyOnTrue); + mOvershootIncreaseNotification.SetNotifyMode(PropertyNotification::NOTIFY_ON_TRUE); mOvershootIncreaseNotification.NotifySignal().Connect(this, &ScrollOvershootEffectRipple::OnOvershootNotification); } @@ -215,7 +215,7 @@ void ScrollOvershootEffectRipple::UpdatePropertyNotifications() reduceStep = MIN_OVERSHOOT_NOTIFY_AMOUNT; } mOvershootDecreaseNotification = self.AddPropertyNotification( mOvershootProperty, InsideCondition(-reduceStep, reduceStep) ); - mOvershootDecreaseNotification.SetNotifyMode(PropertyNotification::NotifyOnTrue); + mOvershootDecreaseNotification.SetNotifyMode(PropertyNotification::NOTIFY_ON_TRUE); mOvershootDecreaseNotification.NotifySignal().Connect(this, &ScrollOvershootEffectRipple::OnOvershootNotification); } } diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp index 2a3bbd5..8b9d384 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp @@ -100,7 +100,7 @@ const std::string INTERNAL_MAX_POSITION_PROPERTY_NAME( "internalMaxPosition" ); */ float VectorInDomain(float a, float b, float start, float end, Dali::Toolkit::DirectionBias bias) { - if(bias == Dali::Toolkit::DirectionBiasNone) + if(bias == Dali::Toolkit::DIRECTION_BIAS_NONE) { return ShortestDistanceInDomain( a, b, start, end ); } @@ -111,7 +111,7 @@ float VectorInDomain(float a, float b, float start, float end, Dali::Toolkit::Di if(vect > 0) { // +ve vector - if(bias == Dali::Toolkit::DirectionBiasRight) // going right, take the vector. + if(bias == Dali::Toolkit::DIRECTION_BIAS_RIGHT) // going right, take the vector. { return vect; } @@ -124,7 +124,7 @@ float VectorInDomain(float a, float b, float start, float end, Dali::Toolkit::Di else { // -ve vector - if(bias == Dali::Toolkit::DirectionBiasLeft) // going left, take the vector. + if(bias == Dali::Toolkit::DIRECTION_BIAS_LEFT) // going left, take the vector. { return vect; } @@ -343,8 +343,8 @@ struct InternalPrePositionConstraint mDomainMax = Vector2( -rulerDomainX.max, -rulerDomainY.max ); mClampX = rulerDomainX.enabled; mClampY = rulerDomainY.enabled; - mFixedRulerX = rulerX->GetType() == Ruler::Fixed; - mFixedRulerY = rulerY->GetType() == Ruler::Fixed; + mFixedRulerX = rulerX->GetType() == Ruler::FIXED; + mFixedRulerY = rulerY->GetType() == Ruler::FIXED; } void operator()( Vector2& scrollPostPosition, const PropertyInputContainer& inputs ) @@ -1238,7 +1238,7 @@ void ScrollView::TransformTo(const Vector2& position, float duration, AlphaFunct true, horizontalBias, verticalBias, - Snap); + SNAP); if(!animating) { @@ -1267,12 +1267,12 @@ void ScrollView::ScrollTo(const Vector2& position) void ScrollView::ScrollTo(const Vector2& position, float duration) { - ScrollTo(position, duration, DirectionBiasNone, DirectionBiasNone); + ScrollTo(position, duration, DIRECTION_BIAS_NONE, DIRECTION_BIAS_NONE); } void ScrollView::ScrollTo(const Vector2& position, float duration, AlphaFunction alpha) { - ScrollTo(position, duration, alpha, DirectionBiasNone, DirectionBiasNone); + ScrollTo(position, duration, alpha, DIRECTION_BIAS_NONE, DIRECTION_BIAS_NONE); } void ScrollView::ScrollTo(const Vector2& position, float duration, @@ -1559,7 +1559,7 @@ bool ScrollView::SnapWithVelocity(Vector2 velocity) Vector2 clampDelta(Vector2::ZERO); ClampPosition(positionSnap); - if( (mRulerX->GetType() == Ruler::Free || mRulerY->GetType() == Ruler::Free) + if( (mRulerX->GetType() == Ruler::FREE || mRulerY->GetType() == Ruler::FREE) && isFreeFlick && !mActorAutoSnapEnabled) { // Calculate target position based on velocity of flick. @@ -1582,12 +1582,12 @@ bool ScrollView::SnapWithVelocity(Vector2 velocity) float t = speed / a; - if(mRulerX->IsEnabled() && mRulerX->GetType() == Ruler::Free) + if(mRulerX->IsEnabled() && mRulerX->GetType() == Ruler::FREE) { positionSnap.x += t*u.x*0.5f; } - if(mRulerY->IsEnabled() && mRulerY->GetType() == Ruler::Free) + if(mRulerY->IsEnabled() && mRulerY->GetType() == Ruler::FREE) { positionSnap.y += t*u.y*0.5f; } @@ -1607,7 +1607,7 @@ bool ScrollView::SnapWithVelocity(Vector2 velocity) // If Axis is Free and has velocity, then calculate time taken // to reach target based on velocity in axis. - if(mRulerX->IsEnabled() && mRulerX->GetType() == Ruler::Free) + if(mRulerX->IsEnabled() && mRulerX->GetType() == Ruler::FREE) { float deltaX = fabsf(startPosition.x - positionSnap.x); @@ -1621,7 +1621,7 @@ bool ScrollView::SnapWithVelocity(Vector2 velocity) } } - if(mRulerY->IsEnabled() && mRulerY->GetType() == Ruler::Free) + if(mRulerY->IsEnabled() && mRulerY->GetType() == Ruler::FREE) { float deltaY = fabsf(startPosition.y - positionSnap.y); @@ -1644,8 +1644,8 @@ bool ScrollView::SnapWithVelocity(Vector2 velocity) bool animating = AnimateTo(positionSnap, positionDuration, alphaFunction, false, - DirectionBiasNone, DirectionBiasNone, - isFlick || isFreeFlick ? Flick : Snap); + DIRECTION_BIAS_NONE, DIRECTION_BIAS_NONE, + isFlick || isFreeFlick ? FLICK : SNAP); return animating; } @@ -1971,7 +1971,7 @@ void ScrollView::OnChildAdd(Actor& child) scrollBar.SetProperty( Dali::Actor::Property::NAME,"ScrollBar"); mInternalActor.Add( scrollBar ); - if( scrollBar.GetScrollDirection() == Toolkit::ScrollBar::Horizontal ) + if( scrollBar.GetScrollDirection() == Toolkit::ScrollBar::HORIZONTAL ) { scrollBar.SetScrollPropertySource( Self(), Toolkit::ScrollView::Property::SCROLL_PRE_POSITION_X, @@ -2141,7 +2141,7 @@ bool ScrollView::OnWheelEvent(const WheelEvent& event) if(mRulerX->IsEnabled() && !mRulerY->IsEnabled()) { // If only the ruler in the X axis is enabled, scroll in the X axis. - if(mRulerX->GetType() == Ruler::Free) + if(mRulerX->GetType() == Ruler::FREE) { // Free panning mode targetScrollPosition.x += event.GetDelta() * mWheelScrollDistanceStep.x; @@ -2157,7 +2157,7 @@ bool ScrollView::OnWheelEvent(const WheelEvent& event) else { // If the ruler in the Y axis is enabled, scroll in the Y axis. - if(mRulerY->GetType() == Ruler::Free) + if(mRulerY->GetType() == Ruler::FREE) { // Free panning mode targetScrollPosition.y += event.GetDelta() * mWheelScrollDistanceStep.y; @@ -2864,7 +2864,7 @@ void ScrollView::SetInternalConstraints() // MoveActor (scrolling) constraint = Constraint::New( self, Actor::Property::POSITION, MoveActorConstraint ); constraint.AddSource( Source( self, Toolkit::ScrollView::Property::SCROLL_POSITION ) ); - constraint.SetRemoveAction(Constraint::Discard); + constraint.SetRemoveAction(Constraint::DISCARD); ApplyConstraintToBoundActors(constraint); // WrapActor (wrap functionality) @@ -2875,7 +2875,7 @@ void ScrollView::SetInternalConstraints() constraint.AddSource( Source( self, Toolkit::Scrollable::Property::SCROLL_POSITION_MIN ) ); constraint.AddSource( Source( self, Toolkit::Scrollable::Property::SCROLL_POSITION_MAX ) ); constraint.AddSource( Source( self, Toolkit::ScrollView::Property::WRAP ) ); - constraint.SetRemoveAction(Constraint::Discard); + constraint.SetRemoveAction(Constraint::DISCARD); ApplyConstraintToBoundActors(constraint); } diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h index a8fcb39..55d51f4 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h @@ -369,13 +369,13 @@ public: * @copydoc ScrollTo(const Vector2&) */ void TransformTo(const Vector2& position, - DirectionBias horizontalBias = DirectionBiasNone, DirectionBias verticalBias = DirectionBiasNone); + DirectionBias horizontalBias = DIRECTION_BIAS_NONE, DirectionBias verticalBias = DIRECTION_BIAS_NONE); /** * @copydoc ScrollTo(const Vector2&, float, AlhpaFunction, DirectionBias, DirectionBias) */ void TransformTo(const Vector2& position, float duration, AlphaFunction alpha, - DirectionBias horizontalBias = DirectionBiasNone, DirectionBias verticalBias = DirectionBiasNone); + DirectionBias horizontalBias = DIRECTION_BIAS_NONE, DirectionBias verticalBias = DIRECTION_BIAS_NONE); /** * @copydoc Toolkit::ScrollView::ScrollTo(const Vector2 &position) @@ -412,7 +412,7 @@ public: /** * @copydoc Toolkit::ScrollView::ScrollTo(unsigned int page, float duration, DirectionBias bias) */ - void ScrollTo(unsigned int page, float duration, DirectionBias bias = DirectionBiasNone); + void ScrollTo(unsigned int page, float duration, DirectionBias bias = DIRECTION_BIAS_NONE); /** * @copydoc Toolkit::ScrollView::ScrollTo(Actor& actor) @@ -482,8 +482,8 @@ public: */ bool AnimateTo(const Vector2& position, const Vector2& positionDuration, AlphaFunction alpha, bool findShortcuts = true, - DirectionBias horizontalBias = DirectionBiasNone, DirectionBias verticalBias = DirectionBiasNone, - SnapType snapType = Snap); + DirectionBias horizontalBias = DIRECTION_BIAS_NONE, DirectionBias verticalBias = DIRECTION_BIAS_NONE, + SnapType snapType = SNAP); /** * @copydoc Toolkit::Scrollable::AddOverlay() diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp index 14bac16..2579f68 100755 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -1728,8 +1728,8 @@ void TextEditor::UpdateScrollBar() CustomActor self = Self(); if( !mScrollBar ) { - mScrollBar = Toolkit::ScrollBar::New( Toolkit::ScrollBar::Vertical ); - mScrollBar.SetIndicatorHeightPolicy( Toolkit::ScrollBar::Variable ); + mScrollBar = Toolkit::ScrollBar::New( Toolkit::ScrollBar::VERTICAL ); + mScrollBar.SetIndicatorHeightPolicy( Toolkit::ScrollBar::VARIABLE ); mScrollBar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT ); mScrollBar.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT ); mScrollBar.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp index 504e453..4a06886 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp @@ -259,7 +259,7 @@ void TextSelectionToolbar::SetUpScrollBar( bool enable ) indicator.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); indicator.SetStyleName( "TextSelectionScrollIndicator" ); - mScrollBar = Toolkit::ScrollBar::New( Toolkit::ScrollBar::Horizontal ); + mScrollBar = Toolkit::ScrollBar::New( Toolkit::ScrollBar::HORIZONTAL ); mScrollBar.SetProperty( Dali::Actor::Property::NAME, "Text popup scroll bar" ); mScrollBar.SetStyleName( "TextSelectionScrollBar" ); mScrollBar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT ); diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp index 183fde2..33431c9 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp @@ -47,7 +47,7 @@ DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ToolBar, Toolkit::Control, Create ) DALI_TYPE_REGISTRATION_END() const float DEFAULT_RELATIVE_SIZE( 0.1f ); -const Toolkit::Alignment::Type DEFAULT_ALIGNMENT( Toolkit::Alignment::HorizontalLeft ); +const Toolkit::Alignment::Type DEFAULT_ALIGNMENT( Toolkit::Alignment::HORIZONTAL_LEFT ); } // namespace Toolkit::ToolBar ToolBar::New() @@ -71,7 +71,7 @@ void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment: unsigned int index = 0; switch( alignment ) { - case Toolkit::Alignment::HorizontalLeft: + case Toolkit::Alignment::HORIZONTAL_LEFT: { index = mLeftOffset; ++mLeftOffset; @@ -79,14 +79,14 @@ void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment: ++mRightBase; break; } - case Toolkit::Alignment::HorizontalCenter: + case Toolkit::Alignment::HORIZONTAL_CENTER: { index = mCenterBase + mCenterOffset; ++mCenterOffset; ++mRightBase; break; } - case Toolkit::Alignment::HorizontalRight: + case Toolkit::Alignment::HORIZONTAL_RIGHT: { index = mRightBase - mRightOffset; ++mRightBase; @@ -122,7 +122,7 @@ void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment: // Update spaces between left, center and right groups of controls. switch( alignment ) { - case Toolkit::Alignment::HorizontalLeft: + case Toolkit::Alignment::HORIZONTAL_LEFT: { mLeftRelativeSpace -= relativeSize; if ( mLeftRelativeSpace < 0.f ) @@ -131,7 +131,7 @@ void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment: } break; } - case Toolkit::Alignment::HorizontalCenter: + case Toolkit::Alignment::HORIZONTAL_CENTER: { mLeftRelativeSpace -= 0.5f * relativeSize; if ( mLeftRelativeSpace < 0.f ) @@ -145,7 +145,7 @@ void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment: } break; } - case Toolkit::Alignment::HorizontalRight: + case Toolkit::Alignment::HORIZONTAL_RIGHT: { mRightRelativeSpace -= relativeSize; if ( mRightRelativeSpace < 0.f ) @@ -179,18 +179,18 @@ void ToolBar::RemoveControl( Actor control ) // Update spaces between left, center and right groups of controls. if( 1.0 > mAccumulatedRelativeSpace ) { - Toolkit::Alignment::Type alignment = Toolkit::Alignment::HorizontalLeft; + Toolkit::Alignment::Type alignment = Toolkit::Alignment::HORIZONTAL_LEFT; if( position.columnIndex < mLeftOffset ) { - alignment = Toolkit::Alignment::HorizontalLeft; + alignment = Toolkit::Alignment::HORIZONTAL_LEFT; } else if( ( position.columnIndex > mLeftOffset ) && ( position.columnIndex < mCenterBase + mCenterOffset ) ) { - alignment = Toolkit::Alignment::HorizontalCenter; + alignment = Toolkit::Alignment::HORIZONTAL_CENTER; } else if( position.columnIndex > mCenterBase + mCenterOffset ) { - alignment = Toolkit::Alignment::HorizontalRight; + alignment = Toolkit::Alignment::HORIZONTAL_RIGHT; } else { @@ -201,7 +201,7 @@ void ToolBar::RemoveControl( Actor control ) switch( alignment ) { - case Toolkit::Alignment::HorizontalLeft: + case Toolkit::Alignment::HORIZONTAL_LEFT: { mLeftRelativeSpace += relativeSize; if ( mLeftRelativeSpace < 0.f ) @@ -210,7 +210,7 @@ void ToolBar::RemoveControl( Actor control ) } break; } - case Toolkit::Alignment::HorizontalCenter: + case Toolkit::Alignment::HORIZONTAL_CENTER: { mLeftRelativeSpace += 0.5f * relativeSize; if ( mLeftRelativeSpace < 0.f ) @@ -224,7 +224,7 @@ void ToolBar::RemoveControl( Actor control ) } break; } - case Toolkit::Alignment::HorizontalRight: + case Toolkit::Alignment::HORIZONTAL_RIGHT: { mRightRelativeSpace += relativeSize; if ( mRightRelativeSpace < 0.f ) diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp index bee7d9a..c22ffe7 100644 --- a/dali-toolkit/internal/text/decorator/text-decorator.cpp +++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp @@ -1517,7 +1517,7 @@ struct Decorator::Impl : public ConnectionTracker LessThanCondition( mBoundingBox.y + topHeight ) ); // Notifies the change from false to true and from true to false. - mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); + mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); // Connects the signals with the callbacks. mHandleVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition ); @@ -1534,7 +1534,7 @@ struct Decorator::Impl : public ConnectionTracker GreaterThanCondition( mBoundingBox.w - bottomHeight ) ); // Notifies the change from false to true and from true to false. - mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); + mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); // Connects the signals with the callbacks. mHandleVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition ); @@ -1554,7 +1554,7 @@ struct Decorator::Impl : public ConnectionTracker LessThanCondition( mBoundingBox.y + topHeight ) ); // Notifies the change from false to true and from true to false. - mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); + mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); // Connects the signals with the callbacks. mHandleVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition ); @@ -1572,7 +1572,7 @@ struct Decorator::Impl : public ConnectionTracker GreaterThanCondition( mBoundingBox.w - bottomHeight ) ); // Notifies the change from false to true and from true to false. - mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); + mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); // Connects the signals with the callbacks. mHandleVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition ); @@ -1590,7 +1590,7 @@ struct Decorator::Impl : public ConnectionTracker LessThanCondition( mBoundingBox.y + topHeight ) ); // Notifies the change from false to true and from true to false. - mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); + mHandleVerticalLessThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); // Connects the signals with the callbacks. mHandleVerticalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition ); @@ -1604,7 +1604,7 @@ struct Decorator::Impl : public ConnectionTracker GreaterThanCondition( mBoundingBox.w - bottomHeight ) ); // Notifies the change from false to true and from true to false. - mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); + mHandleVerticalGreaterThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); // Connects the signals with the callbacks. mHandleVerticalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition ); @@ -1636,7 +1636,7 @@ struct Decorator::Impl : public ConnectionTracker LessThanCondition( mBoundingBox.x + leftWidth ) ); // Notifies the change from false to true and from true to false. - mHandleHorizontalLessThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); + mHandleHorizontalLessThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); // Connects the signals with the callbacks. mHandleHorizontalLessThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition ); @@ -1649,7 +1649,7 @@ struct Decorator::Impl : public ConnectionTracker GreaterThanCondition( mBoundingBox.z - rightWidth ) ); // Notifies the change from false to true and from true to false. - mHandleHorizontalGreaterThanNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); + mHandleHorizontalGreaterThanNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); // Connects the signals with the callbacks. mHandleHorizontalGreaterThanNotification.NotifySignal().Connect( this, &Decorator::Impl::HandleResetPosition ); @@ -1745,8 +1745,8 @@ struct Decorator::Impl : public ConnectionTracker GreaterThanCondition( mBoundingBox.w - popupHalfSize.height ) ); // Notifies the change from false to true and from true to false. - mPopupTopExceedNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); - mPopupBottomExceedNotification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); + mPopupTopExceedNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); + mPopupBottomExceedNotification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); mPopupTopExceedNotification.NotifySignal().Connect( this, &Decorator::Impl::PopUpLeavesTopBoundary ); mPopupBottomExceedNotification.NotifySignal().Connect( this, &Decorator::Impl::PopUpLeavesBottomBoundary ); diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp index 5e5cce7..89c01ca 100755 --- a/dali-toolkit/internal/text/layouts/layout-engine.cpp +++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp @@ -1254,7 +1254,7 @@ struct Engine::Impl return false; } - // Set the line position. Discard if ellipsis is enabled and the position exceeds the boundaries + // Set the line position. DISCARD if ellipsis is enabled and the position exceeds the boundaries // of the box. penY += layout.ascender; diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 3b9e532..fb90b85 100755 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -4150,7 +4150,7 @@ void Controller::ProcessModifyEvents() mImpl->mEventData->mRightSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition; } - // Discard temporary text + // DISCARD temporary text events.Clear(); } diff --git a/dali-toolkit/internal/text/text-enumerations-impl.h b/dali-toolkit/internal/text/text-enumerations-impl.h index 53e4fc1..61428fa 100644 --- a/dali-toolkit/internal/text/text-enumerations-impl.h +++ b/dali-toolkit/internal/text/text-enumerations-impl.h @@ -59,7 +59,7 @@ bool GetLineWrapModeEnumeration( const Property::Value& propertyValue, Toolkit:: /** * @brief Get the alignment string from the provided alignment string. - * @param[in] alignment the Text::Horizontal enum source + * @param[in] alignment the Text::HORIZONTAL enum source * @return the string equivalent */ const char* GetHorizontalAlignmentString( const Toolkit::Text::HorizontalAlignment::Type& alignment ); diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp index effc31a..4842b87 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.cpp @@ -55,7 +55,7 @@ float RulerDomain::Clamp(float x, float length, float scale, ClampState &clamped { if(!enabled) { - clamped = NotClamped; + clamped = NOT_CLAMPED; return x; } @@ -63,16 +63,16 @@ float RulerDomain::Clamp(float x, float length, float scale, ClampState &clamped const float maxExtent = max * scale - length; if(x < minExtent) { - clamped = ClampedToMin; + clamped = CLAMPED_TO_MIN; return minExtent; } else if(x > maxExtent) { - clamped = ClampedToMax; + clamped = CLAMPED_TO_MAX; return maxExtent; } - clamped = NotClamped; + clamped = NOT_CLAMPED; return x; } @@ -86,7 +86,7 @@ float RulerDomain::GetSize() const /////////////////////////////////////////////////////////////////////////////////////////////////// Ruler::Ruler() -: mType(Free), +: mType(FREE), mEnabled(true), mDomain(RulerDomain(0.0f,1.0f,false)) { @@ -157,7 +157,7 @@ float Ruler::SnapAndClamp(float x, float bias, float length, float scale, ClampS DefaultRuler::DefaultRuler() { - mType = Free; + mType = FREE; } float DefaultRuler::Snap(float x, float bias) const @@ -193,7 +193,7 @@ FixedRuler::FixedRuler(float spacing) DALI_LOG_ERROR( "Page spacing too small (%f).\n", double(spacing) ); mSpacing = spacing >= 0.0f ? Math::MACHINE_EPSILON_1 : -Math::MACHINE_EPSILON_1; } - mType = Fixed; + mType = FIXED; } float FixedRuler::Snap(float x, float bias) const diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h index 14b9909..417a8f5 100755 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h @@ -45,9 +45,9 @@ class ScrollView; */ enum ClampState { - NotClamped, ///< The quantity isn't clamped @SINCE_1_0.0 - ClampedToMin, ///< The quantity is clamped to the min value @SINCE_1_0.0 - ClampedToMax ///< The quantity is clamped to the max value @SINCE_1_0.0 + NOT_CLAMPED, ///< The quantity isn't clamped @SINCE_1_9.28 + CLAMPED_TO_MIN, ///< The quantity is clamped to the min value @SINCE_1_9.28 + CLAMPED_TO_MAX ///< The quantity is clamped to the max value @SINCE_1_9.28 }; /** @@ -66,8 +66,8 @@ struct ClampState2D */ enum SnapType { - Snap, ///< Snap @SINCE_1_0.0 - Flick ///< Flick @SINCE_1_0.0 + SNAP, ///< SNAP @SINCE_1_9.28 + FLICK ///< FLICK @SINCE_1_9.28 }; /** @@ -76,9 +76,9 @@ enum SnapType */ enum DirectionBias { - DirectionBiasLeft = -1, ///< Bias scroll snap to Left @SINCE_1_0.0 - DirectionBiasNone = 0, ///< Don't bias scroll snap @SINCE_1_0.0 - DirectionBiasRight = 1 ///< Bias scroll snap to Right @SINCE_1_0.0 + DIRECTION_BIAS_LEFT = -1, ///< Bias scroll snap to Left @SINCE_1_9.28 + DIRECTION_BIAS_NONE = 0, ///< Don't bias scroll snap @SINCE_1_9.28 + DIRECTION_BIAS_RIGHT = 1 ///< Bias scroll snap to Right @SINCE_1_9.28 }; /** @@ -162,8 +162,8 @@ public: * @SINCE_1_0.0 */ enum RulerType { - Fixed, ///< A fixed ruler @SINCE_1_0.0 - Free ///< A free ruler @SINCE_1_0.0 + FIXED, ///< A fixed ruler @SINCE_1_9.28 + FREE ///< A free ruler @SINCE_1_9.28 }; public: @@ -360,7 +360,7 @@ protected: protected: - RulerType mType; ///< Type of Ruler (Fixed or Free). + RulerType mType; ///< Type of Ruler (FIXED or FREE). bool mEnabled; ///< If the ruler is enabled. RulerDomain mDomain; ///< The domain of the ruler. -- 2.7.4