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
Clipping API feature in Actor
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-selection-popup-impl.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
index
1633dc9
..
f3670fd
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
@@
-49,7
+49,7
@@
namespace
// todo Move this to adaptor??
#define GET_LOCALE_TEXT(string) dgettext("dali-toolkit", string)
// todo Move this to adaptor??
#define GET_LOCALE_TEXT(string) dgettext("dali-toolkit", string)
-const std::string TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME( "
textselectionpopupb
utton" );
+const std::string TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME( "
TextSelectionPopupB
utton" );
const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR( Dali::Vector4( 0.24f, 0.72f, 0.8f, 1.0f ) );
#if defined(DEBUG_ENABLED)
const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR( Dali::Vector4( 0.24f, 0.72f, 0.8f, 1.0f ) );
#if defined(DEBUG_ENABLED)
@@
-386,6
+386,10
@@
void TextSelectionPopup::OnInitialize()
Actor self = Self();
self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
self.SetProperty( Actor::Property::COLOR_ALPHA, 0.0f );
Actor self = Self();
self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
self.SetProperty( Actor::Property::COLOR_ALPHA, 0.0f );
+
+ // The Popup Control background is a nine-patch image. We clip against this so the
+ // contents are correctly clipped against the edges of the nine-patch.
+ self.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
}
void TextSelectionPopup::OnStageConnection( int depth )
}
void TextSelectionPopup::OnStageConnection( int depth )
@@
-836,5
+840,3
@@
TextSelectionPopup::~TextSelectionPopup()
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali
-
-