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
Remove/Move experimental features
[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
2248668
..
bf07f06
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
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,7
+22,7
@@
#include <libintl.h>
#include <cfloat>
#include <dali/public-api/animation/animation.h>
#include <libintl.h>
#include <cfloat>
#include <dali/public-api/animation/animation.h>
-#include <dali/
public
-api/images/nine-patch-image.h>
+#include <dali/
devel
-api/images/nine-patch-image.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/math/vector2.h>
#include <dali/public-api/math/vector4.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/math/vector2.h>
#include <dali/public-api/math/vector4.h>
@@
-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 )