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
Merge "Fix for selection handles." into devel/master
[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
91ef03b
..
db7596a
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
@@
-20,6
+20,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
+#include <dali-toolkit/public-api/controls/control-depth-index-ranges.h>
#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
#include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
@@
-576,12
+577,10
@@
Dali::Image TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::But
// Both containers will be added to a button.
Toolkit::TableView optionContainer = Toolkit::TableView::New( (showIcons&showCaption)?2:1 , 1 );
// Both containers will be added to a button.
Toolkit::TableView optionContainer = Toolkit::TableView::New( (showIcons&showCaption)?2:1 , 1 );
- optionContainer.SetDrawMode( DrawMode::OVERLAY );
optionContainer.SetFitHeight( 0 );
optionContainer.SetFitWidth( 0 );
Toolkit::TableView optionPressedContainer = Toolkit::TableView::New( (showIcons&showCaption)?2:1 , 1 );
optionContainer.SetFitHeight( 0 );
optionContainer.SetFitWidth( 0 );
Toolkit::TableView optionPressedContainer = Toolkit::TableView::New( (showIcons&showCaption)?2:1 , 1 );
- optionPressedContainer.SetDrawMode( DrawMode::OVERLAY );
optionPressedContainer.SetFitHeight( 0 );
optionPressedContainer.SetFitWidth( 0 );
optionPressedContainer.SetBackgroundColor( mPressedColor );
optionPressedContainer.SetFitHeight( 0 );
optionPressedContainer.SetFitWidth( 0 );
optionPressedContainer.SetBackgroundColor( mPressedColor );
@@
-619,6
+618,8
@@
Dali::Image TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::But
{
ImageActor pressedIcon = ImageActor::New( iconImage );
ImageActor icon = ImageActor::New( iconImage );
{
ImageActor pressedIcon = ImageActor::New( iconImage );
ImageActor icon = ImageActor::New( iconImage );
+ icon.SetSortModifier( DECORATION_DEPTH_INDEX - 1 );
+ pressedIcon.SetSortModifier( DECORATION_DEPTH_INDEX - 1 );
icon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
pressedIcon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
icon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
pressedIcon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
@@
-767,8
+768,8
@@
TextSelectionPopup::TextSelectionPopup( TextSelectionPopupCallbackInterface* cal
mPressedColor( DEFAULT_OPTION_ICON_PRESSED ),
mSelectOptionPriority( 1 ),
mSelectAllOptionPriority ( 2 ),
mPressedColor( DEFAULT_OPTION_ICON_PRESSED ),
mSelectOptionPriority( 1 ),
mSelectAllOptionPriority ( 2 ),
- mCutOptionPriority (
3
),
- mCopyOptionPriority (
4
),
+ mCutOptionPriority (
4
),
+ mCopyOptionPriority (
3
),
mPasteOptionPriority ( 5 ),
mClipboardOptionPriority( 6 ),
mShowIcons( false ),
mPasteOptionPriority ( 5 ),
mClipboardOptionPriority( 6 ),
mShowIcons( false ),