Peter M. Groen / dali-demo

Commit 8c3bc5dd2ae1dbacc188feec3fb5da331f605c7d

Authored by Seungho BAEK
Committed by Gerrit Code Review
2 parents 9caf959b 345b387d

Merge "Change DevelArcVisual::Action::UPDATE_PROPERTY to DevelVisual::Action::UP… 

…DATE_PROPERTY" into devel/master
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
examples/arc-visual/arc-visual-example.cpp
  View file @8c3bc5d
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 #include <dali-toolkit/devel-api/controls/control-devel.h> 19 #include <dali-toolkit/devel-api/controls/control-devel.h>
20 #include <dali-toolkit/devel-api/visual-factory/transition-data.h> 20 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
21 -#include <dali-toolkit/devel-api/visuals/arc-visual-actions-devel.h> 21 +#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
22 #include <dali-toolkit/devel-api/visuals/arc-visual-properties-devel.h> 22 #include <dali-toolkit/devel-api/visuals/arc-visual-properties-devel.h>
23 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h> 23 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
24 24
@@ -163,7 +163,7 @@ private: @@ -163,7 +163,7 @@ private:
163 Property::Value* value = map.Find(mSelectedPoperty); 163 Property::Value* value = map.Find(mSelectedPoperty);
164 if(value) 164 if(value)
165 { 165 {
166 - DevelControl::DoAction(mControl, Control::Property::BACKGROUND, DevelArcVisual::Action::UPDATE_PROPERTY, Property::Map().Add(mSelectedPoperty, value->Get<float>() + 5.0f)); 166 + DevelControl::DoAction(mControl, Control::Property::BACKGROUND, DevelVisual::Action::UPDATE_PROPERTY, Property::Map().Add(mSelectedPoperty, value->Get<float>() + 5.0f));
167 } 167 }
168 } 168 }
169 else 169 else
@@ -172,7 +172,7 @@ private: @@ -172,7 +172,7 @@ private:
172 Property::Value* value = map.Find(mSelectedPoperty); 172 Property::Value* value = map.Find(mSelectedPoperty);
173 if(value) 173 if(value)
174 { 174 {
175 - DevelControl::DoAction(mControl, Control::Property::BACKGROUND, DevelArcVisual::Action::UPDATE_PROPERTY, Property::Map().Add(mSelectedPoperty, value->Get<float>() - 5.0f)); 175 + DevelControl::DoAction(mControl, Control::Property::BACKGROUND, DevelVisual::Action::UPDATE_PROPERTY, Property::Map().Add(mSelectedPoperty, value->Get<float>() - 5.0f));
176 } 176 }
177 } 177 }
178 } 178 }
@@ -185,7 +185,7 @@ private: @@ -185,7 +185,7 @@ private:
185 { 185 {
186 DevelControl::DoAction(mControl, 186 DevelControl::DoAction(mControl,
187 Control::Property::BACKGROUND, 187 Control::Property::BACKGROUND,
188 - DevelArcVisual::Action::UPDATE_PROPERTY, 188 + DevelVisual::Action::UPDATE_PROPERTY,
189 Property::Map() 189 Property::Map()
190 .Add(DevelArcVisual::Property::START_ANGLE, START_ANGLE_INITIAL_VALUE) 190 .Add(DevelArcVisual::Property::START_ANGLE, START_ANGLE_INITIAL_VALUE)
191 .Add(DevelArcVisual::Property::SWEEP_ANGLE, SWEEP_ANGLE_INITIAL_VALUE)); 191 .Add(DevelArcVisual::Property::SWEEP_ANGLE, SWEEP_ANGLE_INITIAL_VALUE));