projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
22f2502
)
Revert "[Tizen] Apply screen rotation to create window"
author
seungho
<seungho@seungho.tn.corp.samsungelectronics.net>
Wed, 28 Oct 2020 12:24:56 +0000
(21:24 +0900)
committer
seungho
<seungho@seungho.tn.corp.samsungelectronics.net>
Wed, 28 Oct 2020 12:24:56 +0000
(21:24 +0900)
This reverts commit
22f250216e3d70e28db2aa59fef683e5d027594c
.
dali/integration-api/adaptor-framework/scene-holder-impl.cpp
patch
|
blob
|
history
dali/internal/window-system/common/window-render-surface.cpp
patch
|
blob
|
history
dali/internal/window-system/common/window-render-surface.h
patch
|
blob
|
history
diff --git
a/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
b/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
index
ea8a58a
..
e2027ea
100644
(file)
--- a/
dali/integration-api/adaptor-framework/scene-holder-impl.cpp
+++ b/
dali/integration-api/adaptor-framework/scene-holder-impl.cpp
@@
-243,8
+243,7
@@
void SceneHolder::SetAdaptor(Dali::Adaptor& adaptor)
// Create the scene
PositionSize surfacePositionSize = mSurface->GetPositionSize();
// Create the scene
PositionSize surfacePositionSize = mSurface->GetPositionSize();
- int orientation = mSurface->GetOrientation();
- mScene = Dali::Integration::Scene::New( Size(static_cast<float>( surfacePositionSize.width ), static_cast<float>( surfacePositionSize.height )), orientation );
+ mScene = Dali::Integration::Scene::New(Size(static_cast<float>(surfacePositionSize.width), static_cast<float>(surfacePositionSize.height)));
Internal::Adaptor::Adaptor& adaptorImpl = Internal::Adaptor::Adaptor::GetImplementation(adaptor);
mAdaptor = &adaptorImpl;
Internal::Adaptor::Adaptor& adaptorImpl = Internal::Adaptor::Adaptor::GetImplementation(adaptor);
mAdaptor = &adaptorImpl;
diff --git
a/dali/internal/window-system/common/window-render-surface.cpp
b/dali/internal/window-system/common/window-render-surface.cpp
index
b608a27
..
8a066b0
100644
(file)
--- a/
dali/internal/window-system/common/window-render-surface.cpp
+++ b/
dali/internal/window-system/common/window-render-surface.cpp
@@
-108,8
+108,7
@@
WindowRenderSurface::WindowRenderSurface( Dali::PositionSize positionSize, Any s
mRotationSupported( false ),
mRotationFinished( true ),
mScreenRotationFinished( true ),
mRotationSupported( false ),
mRotationFinished( true ),
mScreenRotationFinished( true ),
- mResizeFinished( true ),
- mDefaultScreenRotationAvailable( false )
+ mResizeFinished( true )
{
DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "Creating Window\n" );
Initialize( surface );
{
DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "Creating Window\n" );
Initialize( surface );
@@
-140,16
+139,6
@@
void WindowRenderSurface::Initialize( Any surface )
// Connect signals
mWindowBase->OutputTransformedSignal().Connect( this, &WindowRenderSurface::OutputTransformed );
// Connect signals
mWindowBase->OutputTransformedSignal().Connect( this, &WindowRenderSurface::OutputTransformed );
-
- // Check screen rotation
- mScreenRotationAngle = mWindowBase->GetScreenRotationAngle();
- if( mScreenRotationAngle != 0 )
- {
- mScreenRotationFinished = false;
- mResizeFinished = false;
- mDefaultScreenRotationAvailable = true;
- DALI_LOG_RELEASE_INFO("WindowRenderSurface::Initialize, screen rotation is enabled, screen rotation angle:[%d]\n", mScreenRotationAngle );
- }
}
Any WindowRenderSurface::GetNativeWindow()
}
Any WindowRenderSurface::GetNativeWindow()
@@
-260,20
+249,8
@@
void WindowRenderSurface::CreateSurface()
{
DALI_LOG_TRACE_METHOD( gWindowRenderSurfaceLogFilter );
{
DALI_LOG_TRACE_METHOD( gWindowRenderSurfaceLogFilter );
- int width, height;
- if( mScreenRotationAngle == 0 || mScreenRotationAngle == 180 )
- {
- width = mPositionSize.width;
- height = mPositionSize.height;
- }
- else
- {
- width = mPositionSize.height;
- height = mPositionSize.width;
- }
-
// Create the EGL window
// Create the EGL window
- EGLNativeWindowType window = mWindowBase->CreateEglWindow(
width,
height );
+ EGLNativeWindowType window = mWindowBase->CreateEglWindow(
mPositionSize.width, mPositionSize.
height );
auto eglGraphics = static_cast<EglGraphics *>(mGraphics);
auto eglGraphics = static_cast<EglGraphics *>(mGraphics);
@@
-458,7
+435,7
@@
bool WindowRenderSurface::PreRender( bool resizingSurface, const std::vector<Rec
MakeContextCurrent();
MakeContextCurrent();
- if( resizingSurface
|| mDefaultScreenRotationAvailable
)
+ if( resizingSurface )
{
int totalAngle = (mRotationAngle + mScreenRotationAngle) % 360;
{
int totalAngle = (mRotationAngle + mScreenRotationAngle) % 360;
@@
-471,7
+448,7
@@
bool WindowRenderSurface::PreRender( bool resizingSurface, const std::vector<Rec
// Reset only screen rotation flag
mScreenRotationFinished = true;
// Reset only screen rotation flag
mScreenRotationFinished = true;
- DALI_LOG_
RELEASE_INFO(
"WindowRenderSurface::PreRender: Set rotation [%d] [%d]\n", mRotationAngle, mScreenRotationAngle );
+ DALI_LOG_
INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose,
"WindowRenderSurface::PreRender: Set rotation [%d] [%d]\n", mRotationAngle, mScreenRotationAngle );
}
// Only window rotate
}
// Only window rotate
@@
-499,11
+476,10
@@
bool WindowRenderSurface::PreRender( bool resizingSurface, const std::vector<Rec
mWindowBase->ResizeEglWindow( positionSize );
mResizeFinished = true;
mWindowBase->ResizeEglWindow( positionSize );
mResizeFinished = true;
- DALI_LOG_
RELEASE_INFO(
"WindowRenderSurface::PreRender: Set resize\n" );
+ DALI_LOG_
INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose,
"WindowRenderSurface::PreRender: Set resize\n" );
}
SetFullSwapNextFrame();
}
SetFullSwapNextFrame();
- mDefaultScreenRotationAvailable = false;
}
SetBufferDamagedRects( damagedRects, clippingRect );
}
SetBufferDamagedRects( damagedRects, clippingRect );
diff --git
a/dali/internal/window-system/common/window-render-surface.h
b/dali/internal/window-system/common/window-render-surface.h
index
373e131
..
c00395f
100644
(file)
--- a/
dali/internal/window-system/common/window-render-surface.h
+++ b/
dali/internal/window-system/common/window-render-surface.h
@@
-316,7
+316,6
@@
private: // Data
bool mRotationFinished;
bool mScreenRotationFinished;
bool mResizeFinished;
bool mRotationFinished;
bool mScreenRotationFinished;
bool mResizeFinished;
- bool mDefaultScreenRotationAvailable;
}; // class WindowRenderSurface
}; // class WindowRenderSurface