diff options
| author | Joogab Yun <joogab.yun@samsung.com> | 2019-12-27 17:54:55 +0900 |
|---|---|---|
| committer | Joogab Yun <joogab.yun@samsung.com> | 2019-12-27 17:54:55 +0900 |
| commit | 75ec03ec8ee7ab8c6e99355479787bfcf7481aed (patch) | |
| tree | df66cdd9194bea500f0a9cbaf0eb2ae653f7b353 | |
| parent | db3c8b111b169d68b5b63cd27bfccb9c2f63e56e (diff) | |
| parent | 4e0bfdbda5ac9c417fac39dccad26391fe8c0174 (diff) | |
| download | dali-demo-tizen_5.5_tv.tar.gz dali-demo-tizen_5.5_tv.tar.bz2 dali-demo-tizen_5.5_tv.zip | |
Merge branch 'devel/master' into tizen_5.5submit/tizen_5.5/20200413.043500submit/tizen_5.5/20200406.055653submit/tizen_5.5/20200401.012953submit/tizen_5.5/20200331.090851submit/tizen_5.5/20200218.013117submit/tizen_5.5/20200217.020405submit/tizen_5.5/20200214.020309submit/tizen_5.5/20200205.062646submit/tizen_5.5/20200123.060916submit/tizen_5.5/20200120.082613submit/tizen_5.5/20200102.004531submit/tizen_5.5/20191230.003219submit/tizen_5.5/20191227.100026accepted/tizen/5.5/unified/20200413.131105accepted/tizen/5.5/unified/20200402.163502accepted/tizen/5.5/unified/20200219.071434accepted/tizen/5.5/unified/20200206.060325accepted/tizen/5.5/unified/20200128.122315accepted/tizen/5.5/unified/20200121.041233accepted/tizen/5.5/unified/20200102.110135accepted/tizen/5.5/unified/20200102.013934tizen_5.5_tv
| -rwxr-xr-x | packaging/com.samsung.dali-demo.spec | 2 | ||||
| -rw-r--r-- | shared/dali-table-view.cpp | 19 |
2 files changed, 16 insertions, 5 deletions
diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 7f49403b..f40233ac 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -2,7 +2,7 @@ Name: com.samsung.dali-demo Summary: The OpenGLES Canvas Core Demo -Version: 1.4.50 +Version: 1.4.51 Release: 1 Group: System/Libraries License: Apache-2.0 diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp index 3760172f..aba375ab 100644 --- a/shared/dali-table-view.cpp +++ b/shared/dali-table-view.cpp @@ -287,10 +287,21 @@ void DaliTableView::Initialize( Application& application ) ApplyCubeEffectToPages(); Dali::Window winHandle = application.GetWindow(); - winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT ); - winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE ); - winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); - winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); + + if( stageSize.width <= stageSize.height ) + { + winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT ); + winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE ); + winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); + winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); + } + else + { + winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE ); + winHandle.RemoveAvailableOrientation( Dali::Window::PORTRAIT ); + winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); + winHandle.RemoveAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); + } // Set initial orientation unsigned int degrees = 0; |