From c9fdc04662f0120c05fe5ad231096135075cdef2 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Fri, 27 Dec 2019 17:30:07 +0900 Subject: [PATCH] Revert "[Tizen] Fix Window-rotation's bugs" This reverts commit aab7307b09db8231e74f1412eb3cbabb95aa257c. --- .../tizen-wayland/ecore-wl/window-base-ecore-wl.cpp | 12 ++++-------- .../tizen-wayland/ecore-wl/window-base-ecore-wl.h | 2 -- .../tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp | 11 ++++------- .../tizen-wayland/ecore-wl2/window-base-ecore-wl2.h | 2 -- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp index 150e257..4258b7f 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp @@ -655,11 +655,6 @@ void WindowBaseEcoreWl::Initialize( PositionSize positionSize, Any surface, bool CreateWindow( positionSize ); } - for( int i = 0; i < 4; ++i ) - { - mAvaiableWindowOrientations[i] = 0; - } - mWlSurface = ecore_wl_window_surface_create( mEcoreWindow ); SetTransparency( isTransparent ); @@ -1372,13 +1367,14 @@ void WindowBaseEcoreWl::Activate() void WindowBaseEcoreWl::SetAvailableAnlges( const std::vector< int >& angles ) { + int rotations[4] = { 0 }; DALI_LOG_RELEASE_INFO( "WindowBaseEcoreWl::SetAvailableAnlges, angle's count: %d\n", angles.size() ); for( std::size_t i = 0; i < angles.size(); ++i ) { - mAvaiableWindowOrientations[i] = static_cast< int >( angles[i] ); - DALI_LOG_RELEASE_INFO( "%d ", mAvaiableWindowOrientations[i] ); + rotations[i] = static_cast< int >( angles[i] ); + DALI_LOG_RELEASE_INFO( "%d ", rotations[i] ); } - ecore_wl_window_rotation_available_rotations_set( mEcoreWindow, mAvaiableWindowOrientations, angles.size() ); + ecore_wl_window_rotation_available_rotations_set( mEcoreWindow, rotations, angles.size() ); } void WindowBaseEcoreWl::SetPreferredAngle( int angle ) diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h index 1934452..2d0a4ce 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h +++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h @@ -489,8 +489,6 @@ private: int mWindowRotationAngle; int mScreenRotationAngle; int mSupportedPreProtation; - - int mAvaiableWindowOrientations[4]; #ifdef DALI_ELDBUS_AVAILABLE Eldbus_Connection* mSystemConnection; #endif // DALI_ELDBUS_AVAILABLE diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp index ca767b3..8524266 100755 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp @@ -760,11 +760,6 @@ void WindowBaseEcoreWl2::Initialize( PositionSize positionSize, Any surface, boo CreateWindow( positionSize ); } - for( int i = 0; i < 4; ++i ) - { - mAvaiableWindowOrientations[i] = 0; - } - mWlSurface = ecore_wl2_window_surface_get( mEcoreWindow ); SetTransparency( isTransparent ); @@ -1567,12 +1562,14 @@ void WindowBaseEcoreWl2::Activate() void WindowBaseEcoreWl2::SetAvailableAnlges( const std::vector< int >& angles ) { + int rotations[4] = { 0 }; DALI_LOG_RELEASE_INFO( "WindowBaseEcoreWl2::SetAvailableAnlges, angle's count: %d, angles\n", angles.size() ); for( std::size_t i = 0; i < angles.size(); ++i ) { - mAvaiableWindowOrientations[i] = static_cast< int >( angles[i] ); + rotations[i] = static_cast< int >( angles[i] ); + DALI_LOG_RELEASE_INFO( "%d ", rotations[i] ); } - ecore_wl2_window_available_rotations_set( mEcoreWindow, mAvaiableWindowOrientations, angles.size() ); + ecore_wl2_window_available_rotations_set( mEcoreWindow, rotations, angles.size() ); } void WindowBaseEcoreWl2::SetPreferredAngle( int angle ) diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h index 6cb0a0b..bd4afb5 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h @@ -515,8 +515,6 @@ private: int mWindowRotationAngle; int mScreenRotationAngle; int mSupportedPreProtation; - - int mAvaiableWindowOrientations[4]; #ifdef DALI_ELDBUS_AVAILABLE Eldbus_Connection* mSystemConnection; #endif // DALI_ELDBUS_AVAILABLE -- 2.7.4