Peter M. Groen / dali-demo

Commit c5140fd4633cf58e69ee75a0f3166dd7508d8e2f

Authored by sunghyun kim
Committed by Gerrit Code Review
2 parents 0b421617 f79abc4c

Merge "Add new fittingMode for visualFitting" into devel/master

Inline Side-by-side
Showing 2 changed files with 6 additions and 0 deletions
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @c5140fd
... ... @@ -94,6 +94,9 @@ FittingMode::Type NextScalingMode(FittingMode::Type oldMode)
94 94 newMode = FittingMode::FIT_HEIGHT;
95 95 break;
96 96 case FittingMode::FIT_HEIGHT:
  97 + newMode = FittingMode::VISUAL_FITTING;
  98 + break;
  99 + case FittingMode::VISUAL_FITTING:
97 100 newMode = FittingMode::SHRINK_TO_FIT;
98 101 break;
99 102 }
... ...
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @c5140fd
... ... @@ -211,6 +211,9 @@ Dali::FittingMode::Type NextMode(const Dali::FittingMode::Type oldMode)
211 211 newMode = FittingMode::FIT_HEIGHT;
212 212 break;
213 213 case FittingMode::FIT_HEIGHT:
  214 + newMode = FittingMode::VISUAL_FITTING;
  215 + break;
  216 + case FittingMode::VISUAL_FITTING:
214 217 newMode = FittingMode::SHRINK_TO_FIT;
215 218 break;
216 219 }
... ...