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
/
ubuntu-x11
/
window-base-ecore-x.h
diff --git
a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h
b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h
index
f6618e7
..
8ab7080
100644
(file)
--- a/
dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h
+++ b/
dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h
@@
-199,14
+199,14
@@
public:
virtual void Activate() override;
/**
virtual void Activate() override;
/**
- * @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailable
Orientation
s()
+ * @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailable
Anlge
s()
*/
*/
- virtual void SetAvailable
Orientations( const std::vector< Dali::Window::WindowOrientation >& orientation
s ) override;
+ virtual void SetAvailable
Anlges( const std::vector< int >& angle
s ) override;
/**
/**
- * @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferred
Orientation
()
+ * @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferred
Angle
()
*/
*/
- virtual void SetPreferred
Orientation( Dali::Window::WindowOrientation orientation
) override;
+ virtual void SetPreferred
Angle( int angle
) override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetAcceptFocus()
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetAcceptFocus()
@@
-329,12
+329,6
@@
public:
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
- * @brief Return the orientation of the surface.
- * @return The orientation
- */
- virtual int GetOrientation() const override;
-
- /**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle()
*/
virtual int GetScreenRotationAngle() override;
* @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle()
*/
virtual int GetScreenRotationAngle() override;
@@
-345,11
+339,6
@@
public:
virtual void SetWindowRotationAngle( int degree ) override;
/**
virtual void SetWindowRotationAngle( int degree ) override;
/**
- * @copydoc Dali::Internal::Adaptor::WindowBase::GetWindowRotationAngle()
- */
- virtual int GetWindowRotationAngle() override;
-
- /**
* @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted()
*/
virtual void WindowRotationCompleted( int degree, int width, int height ) override;
* @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted()
*/
virtual void WindowRotationCompleted( int degree, int width, int height ) override;
@@
-362,12
+351,7
@@
public:
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetParent()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetParent()
*/
- virtual void SetParent( Any parent ) override;
-
- /**
- * @copydoc Dali::Internal::Adaptor::WindowBase::IsMatchedWindow()
- */
- virtual bool IsMatchedWindow( Any window ) override;
+ virtual void SetParent( WindowBase* parentWinBase ) override;
private:
private: