projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen](ATSPI) squashed implementation
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
popup
/
popup-impl.cpp
diff --git
a/dali-toolkit/internal/controls/popup/popup-impl.cpp
b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index
9794921
..
44da4dd
100644
(file)
--- a/
dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/
dali-toolkit/internal/controls/popup/popup-impl.cpp
@@
-30,16
+30,17
@@
#include <dali/public-api/events/touch-data.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/devel-api/scripting/scripting.h>
#include <dali/public-api/events/touch-data.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/devel-api/scripting/scripting.h>
+#include <dali/devel-api/actors/actor-devel.h>
#include <dali/public-api/size-negotiation/relayout-container.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
#include <dali/public-api/size-negotiation/relayout-container.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
using namespace Dali;
using namespace Dali;
@@
-262,6
+263,10
@@
Popup::Popup()
mTailRightImage( DEFAULT_TAIL_RIGHT_IMAGE_PATH )
{
SetKeyboardNavigationSupport( true );
mTailRightImage( DEFAULT_TAIL_RIGHT_IMAGE_PATH )
{
SetKeyboardNavigationSupport( true );
+ DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
+ return std::unique_ptr< Dali::Accessibility::Accessible >(
+ new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::DIALOG, true ) );
+ } );
}
void Popup::OnInitialize()
}
void Popup::OnInitialize()
@@
-332,6
+337,8
@@
void Popup::OnInitialize()
Popup::~Popup()
{
Popup::~Popup()
{
+ if( DevelControl::GetBoundAccessibilityObject( Self() ) )
+ Accessibility::Bridge::GetCurrentBridge()->RemovePopup( DevelControl::GetBoundAccessibilityObject( Self() ) );
mEntryAnimationData.Clear();
mExitAnimationData.Clear();
}
mEntryAnimationData.Clear();
mExitAnimationData.Clear();
}
@@
-592,6
+599,7
@@
void Popup::SetPopupBackgroundImage( Actor image )
const bool prevAlter = mAlterAddedChild;
mAlterAddedChild = false;
mPopupContainer.Add( mPopupBackgroundImage );
const bool prevAlter = mAlterAddedChild;
mAlterAddedChild = false;
mPopupContainer.Add( mPopupBackgroundImage );
+ mPopupBackgroundImage.LowerToBottom();
mAlterAddedChild = prevAlter;
if( mTailImage )
mAlterAddedChild = prevAlter;
if( mTailImage )
@@
-917,7
+925,6
@@
Toolkit::Control Popup::CreateBacking()
// Must always be positioned top-left of stage, regardless of parent.
backing.SetInheritPosition(false);
// Must always be positioned top-left of stage, regardless of parent.
backing.SetInheritPosition(false);
- backing.SetAnchorPoint( AnchorPoint::TOP_LEFT );
// Always the full size of the stage.
backing.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
// Always the full size of the stage.
backing.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
@@
-1572,12
+1579,21
@@
bool Popup::OnDialogTouched( Actor actor, const TouchData& touch )
return true;
}
return true;
}
+void Popup::OnStageDisconnection()
+{
+ auto p = Dali::Accessibility::Accessible::Get(Self());
+ Accessibility::Bridge::GetCurrentBridge()->RemovePopup( p );
+ Control::OnStageDisconnection();
+}
+
void Popup::OnStageConnection( int depth )
{
mLayoutDirty = true;
RelayoutRequest();
Control::OnStageConnection( depth );
void Popup::OnStageConnection( int depth )
{
mLayoutDirty = true;
RelayoutRequest();
Control::OnStageConnection( depth );
+ auto p = Dali::Accessibility::Accessible::Get(Self());
+ Accessibility::Bridge::GetCurrentBridge()->AddPopup( p );
}
void Popup::OnChildAdd( Actor& child )
}
void Popup::OnChildAdd( Actor& child )