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
[Tizen] Add rotation's values to winBase-wl2
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
tizen-wayland
/
ecore-wl2
/
window-base-ecore-wl2.h
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
2b45ae0
..
83d06d2
100644
(file)
--- 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
@@
-26,6
+26,7
@@
#include <Ecore_Wl2.h>
#include <tizen-extension-client-protocol.h>
#include <wayland-egl.h>
#include <Ecore_Wl2.h>
#include <tizen-extension-client-protocol.h>
#include <wayland-egl.h>
+#include <xkbcommon/xkbcommon.h>
#ifdef DALI_ELDBUS_AVAILABLE
#include <Eldbus.h>
#ifdef DALI_ELDBUS_AVAILABLE
#include <Eldbus.h>
@@
-155,6
+156,11
@@
public:
*/
void OnFontSizeChanged();
*/
void OnFontSizeChanged();
+ /**
+ * @brief Called when a transition effect-start/end event is received.
+ */
+ void OnTransitionEffectEvent( DevelWindow::EffectState state, DevelWindow::EffectType type );
+
#ifdef DALI_ELDBUS_AVAILABLE
/**
* @brief Called when Ecore ElDBus accessibility event is received.
#ifdef DALI_ELDBUS_AVAILABLE
/**
* @brief Called when Ecore ElDBus accessibility event is received.
@@
-163,6
+169,11
@@
public:
#endif
/**
#endif
/**
+ * @brief Called when a keymap is changed.
+ */
+ void KeymapChanged(void *data, int type, void *event);
+
+ /**
* @brief RegistryGlobalCallback
*/
void RegistryGlobalCallback( void* data, struct wl_registry *registry, uint32_t name, const char* interface, uint32_t version );
* @brief RegistryGlobalCallback
*/
void RegistryGlobalCallback( void* data, struct wl_registry *registry, uint32_t name, const char* interface, uint32_t version );
@@
-187,6
+198,12
@@
public:
*/
void DisplayPolicyBrightnessChangeDone( void* data, struct tizen_display_policy *displayPolicy, struct wl_surface* surface, int32_t brightness, uint32_t state );
*/
void DisplayPolicyBrightnessChangeDone( void* data, struct tizen_display_policy *displayPolicy, struct wl_surface* surface, int32_t brightness, uint32_t state );
+
+ /**
+ * @brief Gets the key code by keyName.
+ */
+ void GetKeyCode( std::string keyName, int32_t& keyCode );
+
public:
/**
public:
/**
@@
-270,14
+287,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()
@@
-400,6
+417,12
@@
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;
@@
-410,6
+433,11
@@
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;
@@
-422,12
+450,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:
@@
-467,6
+490,7
@@
private:
wl_event_queue* mEventQueue;
tizen_policy* mTizenPolicy;
tizen_display_policy* mTizenDisplayPolicy;
wl_event_queue* mEventQueue;
tizen_policy* mTizenPolicy;
tizen_display_policy* mTizenDisplayPolicy;
+ xkb_keymap* mKeyMap;
std::vector< std::string > mSupportedAuxiliaryHints;
AuxiliaryHints mAuxiliaryHints;
std::vector< std::string > mSupportedAuxiliaryHints;
AuxiliaryHints mAuxiliaryHints;
@@
-488,6
+512,13
@@
private:
volatile uint32_t mMoveResizeSerial;
uint32_t mLastSubmittedMoveResizeSerial;
volatile uint32_t mMoveResizeSerial;
uint32_t mLastSubmittedMoveResizeSerial;
+ 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
#ifdef DALI_ELDBUS_AVAILABLE
Eldbus_Connection* mSystemConnection;
#endif // DALI_ELDBUS_AVAILABLE