Peter M. Groen / dali-demo

Commit e08a711d2c1c34fde64eb8c89c7963a9e3c8cb7d

Authored by Wonsik Jung
Committed by Gerrit Code Review
2 parents 748040d5 bdac865b

Merge "Modify window enum type's use-case" into devel/master

Inline Side-by-side
Showing 4 changed files with 20 additions and 20 deletions
examples/motion-blur/motion-blur-example.cpp
  View file @e08a711
... ... @@ -183,10 +183,10 @@ public:
183 183 mTapGestureDetector.DetectedSignal().Connect(this, &MotionBlurExampleApp::OnTap);
184 184  
185 185 Dali::Window winHandle = app.GetWindow();
186   - winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT);
187   - winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE);
188   - winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT_INVERSE);
189   - winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE_INVERSE);
  186 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT);
  187 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE);
  188 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT_INVERSE);
  189 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE_INVERSE);
190 190 winHandle.ResizeSignal().Connect(this, &MotionBlurExampleApp::OnWindowResized);
191 191  
192 192 // set initial orientation
... ...
examples/motion-stretch/motion-stretch-example.cpp
  View file @e08a711
... ... @@ -162,10 +162,10 @@ public:
162 162  
163 163 // set initial orientation
164 164 Dali::Window winHandle = app.GetWindow();
165   - winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT);
166   - winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE);
167   - winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT_INVERSE);
168   - winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE_INVERSE);
  165 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT);
  166 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE);
  167 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT_INVERSE);
  168 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE_INVERSE);
169 169 winHandle.ResizeSignal().Connect(this, &MotionStretchExampleApp::OnWindowResized);
170 170  
171 171 // set initial orientation
... ...
examples/page-turn-view/page-turn-view-example.cpp
  View file @e08a711
... ... @@ -199,10 +199,10 @@ void PageTurnExample::OnInit(Application& app)
199 199 Window window = app.GetWindow();
200 200 window.KeyEventSignal().Connect(this, &PageTurnExample::OnKeyEvent);
201 201  
202   - window.AddAvailableOrientation(Window::PORTRAIT);
203   - window.AddAvailableOrientation(Window::LANDSCAPE);
204   - window.AddAvailableOrientation(Window::PORTRAIT_INVERSE);
205   - window.AddAvailableOrientation(Window::LANDSCAPE_INVERSE);
  202 + window.AddAvailableOrientation(WindowOrientation::PORTRAIT);
  203 + window.AddAvailableOrientation(WindowOrientation::LANDSCAPE);
  204 + window.AddAvailableOrientation(WindowOrientation::PORTRAIT_INVERSE);
  205 + window.AddAvailableOrientation(WindowOrientation::LANDSCAPE_INVERSE);
206 206 window.ResizeSignal().Connect(this, &PageTurnExample::OnWindowResized);
207 207  
208 208 Window::WindowSize size = window.GetSize();
... ...
shared/dali-table-view.cpp
  View file @e08a711
... ... @@ -294,17 +294,17 @@ void DaliTableView::Initialize(Application& application)
294 294  
295 295 if(windowSize.GetWidth() <= windowSize.GetHeight())
296 296 {
297   - winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT);
298   - winHandle.RemoveAvailableOrientation(Dali::Window::LANDSCAPE);
299   - winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT_INVERSE);
300   - winHandle.RemoveAvailableOrientation(Dali::Window::LANDSCAPE_INVERSE);
  297 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT);
  298 + winHandle.RemoveAvailableOrientation(Dali::WindowOrientation::LANDSCAPE);
  299 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::PORTRAIT_INVERSE);
  300 + winHandle.RemoveAvailableOrientation(Dali::WindowOrientation::LANDSCAPE_INVERSE);
301 301 }
302 302 else
303 303 {
304   - winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE);
305   - winHandle.RemoveAvailableOrientation(Dali::Window::PORTRAIT);
306   - winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE_INVERSE);
307   - winHandle.RemoveAvailableOrientation(Dali::Window::PORTRAIT_INVERSE);
  304 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE);
  305 + winHandle.RemoveAvailableOrientation(Dali::WindowOrientation::PORTRAIT);
  306 + winHandle.AddAvailableOrientation(Dali::WindowOrientation::LANDSCAPE_INVERSE);
  307 + winHandle.RemoveAvailableOrientation(Dali::WindowOrientation::PORTRAIT_INVERSE);
308 308 }
309 309  
310 310 // Set initial orientation
... ...