From 982b56208ab2c73381e79f7aefb4613087dd93d3 Mon Sep 17 00:00:00 2001 From: neostom432 Date: Tue, 16 Jun 2020 02:40:48 +0900 Subject: [PATCH] Revert "[Tizen] Add rotation's values to winBase-wl2" This reverts commit a0d8f118c92154409e8285d15138ac6928983537. --- .../tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp | 15 +++++---------- .../tizen-wayland/ecore-wl2/window-base-ecore-wl2.h | 4 ---- 2 files changed, 5 insertions(+), 14 deletions(-) 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 be48236..0a1bec4 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 @@ -762,11 +762,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 ); @@ -1575,14 +1570,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() ); - std::size_t size = angles.size(); - for( std::size_t i = 0; i < size; ++i ) + 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_wl2_window_available_rotations_set( mEcoreWindow, mAvaiableWindowOrientations, 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 4825a33..764b7d4 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 @@ -518,10 +518,6 @@ private: int mWindowRotationAngle; int mScreenRotationAngle; int mSupportedPreProtation; - - // Temporary solution to fix window rotation and window hide - // It will be removed when EFL patch is completed. - int mAvaiableWindowOrientations[4]; #ifdef DALI_ELDBUS_AVAILABLE Eldbus_Connection* mSystemConnection; #endif // DALI_ELDBUS_AVAILABLE -- 2.7.4