projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Add screen and client rotation itself function"
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
tizen-wayland
/
ecore-wl
/
window-base-ecore-wl.cpp
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
5495b17
..
509ddd4
100644
(file)
--- 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
@@
-268,6
+268,7
@@
static Eina_Bool EcoreEventRotate( void* data, int type, void* event )
WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
if( windowBase )
{
WindowBaseEcoreWl* windowBase = static_cast< WindowBaseEcoreWl* >( data );
if( windowBase )
{
+ DALI_LOG_RELEASE_INFO( "WindowBaseEcoreWl::EcoreEventRotate\n" );
windowBase->OnRotation( data, type, event );
}
return ECORE_CALLBACK_PASS_ON;
windowBase->OnRotation( data, type, event );
}
return ECORE_CALLBACK_PASS_ON;
@@
-584,10
+585,7
@@
WindowBaseEcoreWl::WindowBaseEcoreWl( Dali::PositionSize positionSize, Any surfa
mBrightness( 0 ),
mBrightnessChangeState( 0 ),
mBrightnessChangeDone( true ),
mBrightness( 0 ),
mBrightnessChangeState( 0 ),
mBrightnessChangeDone( true ),
- mOwnSurface( false ),
- mWindowRotationAngle( 0 ),
- mScreenRotationAngle( 0 ),
- mSupportedPreProtation( 0 )
+ mOwnSurface( false )
#ifdef DALI_ELDBUS_AVAILABLE
, mSystemConnection( NULL )
#endif
#ifdef DALI_ELDBUS_AVAILABLE
, mSystemConnection( NULL )
#endif
@@
-812,7
+810,7
@@
void WindowBaseEcoreWl::OnRotation( void* data, int type, void* event )
if( ev->win == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
{
if( ev->win == static_cast< unsigned int >( ecore_wl_window_id_get( mEcoreWindow ) ) )
{
- DALI_LOG_
INFO( gWindowBaseLogFilter, Debug::Concise, "WindowBaseEcoreWl::OnRotation\n"
);
+ DALI_LOG_
RELEASE_INFO( "WindowBaseEcoreWl::OnRotation, angle: %d, width: %d, height: %d\n", ev->angle, ev->w, ev->h
);
RotationEvent rotationEvent;
rotationEvent.angle = ev->angle;
RotationEvent rotationEvent;
rotationEvent.angle = ev->angle;
@@
-1319,10
+1317,9
@@
bool WindowBaseEcoreWl::IsEglWindowRotationSupported()
wl_egl_window_capability capability = static_cast< wl_egl_window_capability >( wl_egl_window_get_capabilities( mEglWindow ) );
if( capability == WL_EGL_WINDOW_CAPABILITY_ROTATION_SUPPORTED )
{
wl_egl_window_capability capability = static_cast< wl_egl_window_capability >( wl_egl_window_get_capabilities( mEglWindow ) );
if( capability == WL_EGL_WINDOW_CAPABILITY_ROTATION_SUPPORTED )
{
- mSupportedPreProtation = true;
return true;
}
return true;
}
- mSupportedPreProtation = false;
+
return false;
}
return false;
}
@@
-1364,19
+1361,21
@@
void WindowBaseEcoreWl::Activate()
ecore_wl_window_activate( mEcoreWindow );
}
ecore_wl_window_activate( mEcoreWindow );
}
-void WindowBaseEcoreWl::SetAvailable
Orientations( const std::vector< Dali::Window::WindowOrientation >& orientation
s )
+void WindowBaseEcoreWl::SetAvailable
Anlges( const std::vector< int >& angle
s )
{
int rotations[4] = { 0 };
{
int rotations[4] = { 0 };
- for( std::size_t i = 0; i < orientations.size(); ++i )
+ DALI_LOG_RELEASE_INFO( "WindowBaseEcoreWl::SetAvailableAnlges, angle's count: %d\n", angles.size() );
+ for( std::size_t i = 0; i < angles.size(); ++i )
{
{
- rotations[i] = static_cast< int >( orientations[i] );
+ rotations[i] = static_cast< int >( angles[i] );
+ DALI_LOG_RELEASE_INFO( "%d ", rotations[i] );
}
}
- ecore_wl_window_rotation_available_rotations_set( mEcoreWindow, rotations,
orientation
s.size() );
+ ecore_wl_window_rotation_available_rotations_set( mEcoreWindow, rotations,
angle
s.size() );
}
}
-void WindowBaseEcoreWl::SetPreferred
Orientation( Dali::Window::WindowOrientation orientation
)
+void WindowBaseEcoreWl::SetPreferred
Angle( int angle
)
{
{
- ecore_wl_window_rotation_preferred_rotation_set( mEcoreWindow,
orientation
);
+ ecore_wl_window_rotation_preferred_rotation_set( mEcoreWindow,
angle
);
}
void WindowBaseEcoreWl::SetAcceptFocus( bool accept )
}
void WindowBaseEcoreWl::SetAcceptFocus( bool accept )
@@
-2063,16
+2062,6
@@
void WindowBaseEcoreWl::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVe
dpiVertical = int( yres + 0.5f );
}
dpiVertical = int( yres + 0.5f );
}
-int WindowBaseEcoreWl::GetOrientation() const
-{
- int orientation = (mScreenRotationAngle + mWindowRotationAngle) % 360;
- if( mSupportedPreProtation )
- {
- orientation = 0;
- }
- return orientation;
-}
-
int WindowBaseEcoreWl::GetScreenRotationAngle()
{
int transform = 0;
int WindowBaseEcoreWl::GetScreenRotationAngle()
{
int transform = 0;
@@
-2086,21
+2075,14
@@
int WindowBaseEcoreWl::GetScreenRotationAngle()
transform = ecore_wl_output_transform_get( ecore_wl_window_output_find( mEcoreWindow ) );
}
transform = ecore_wl_output_transform_get( ecore_wl_window_output_find( mEcoreWindow ) );
}
- mScreenRotationAngle = transform * 90;
- return mScreenRotationAngle;
+ return transform * 90;
}
void WindowBaseEcoreWl::SetWindowRotationAngle( int degree )
{
}
void WindowBaseEcoreWl::SetWindowRotationAngle( int degree )
{
- mWindowRotationAngle = degree;
ecore_wl_window_rotation_set( mEcoreWindow, degree );
}
ecore_wl_window_rotation_set( mEcoreWindow, degree );
}
-int WindowBaseEcoreWl::GetWindowRotationAngle()
-{
- return mWindowRotationAngle;
-}
-
void WindowBaseEcoreWl::WindowRotationCompleted( int degree, int width, int height )
{
ecore_wl_window_rotation_change_done_send( mEcoreWindow );
void WindowBaseEcoreWl::WindowRotationCompleted( int degree, int width, int height )
{
ecore_wl_window_rotation_change_done_send( mEcoreWindow );