From ff7053b7496f8c841ce0262cdbe2b7bd3fd43ec9 Mon Sep 17 00:00:00 2001
From: Agnelo Vaz <agnelo.vaz@samsung.com>
Date: Mon, 6 Jul 2015 17:00:00 +0100
Subject: [PATCH] TextSelection Popup Styling Image update and json

Change-Id: I75fa29003e4f77aa7b81294ea6205fb5ad7ad7ef
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
---
 dali-toolkit/images/selection-popup-bg#.png           | Bin 1399 -> 1446 bytes
 .../text-controls/text-selection-popup-impl.cpp       |   9 ++++++++-
 dali-toolkit/styles/dali-toolkit-default-theme.json   |   7 +++++--
 .../styles/mobile/dali-toolkit-default-theme.json     |   7 +++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/dali-toolkit/images/selection-popup-bg#.png b/dali-toolkit/images/selection-popup-bg#.png
index 3eac19f2c3a3ea7295d60a90fd68d9f32db6131c..bd9119182a4eb54f42a8d2e7dd945588cdd00056 100755
GIT binary patch
delta 740
zcmey)wTyd$%0x$1#-@$w0!%SRmIelH#s<cQ&V~kthOVZLu8vO57KUbqj%MaA&TcMB
z3Kh8pzP?tTdBr7(dC94sF1AWQ5xvaJ6f3A+BV2kXUuIGfbXG7jFf>)r@J&q4%qz(+
z&X~-^Y*=q(X_}a9X=bRKXqslAYhsydu4|E!Y^G~qVPtA#Zfa<hWNxXXP+Ss}nr4-f
zpIn-onpXm{Ix!_bDHS9Fw7wuCA7oyBft5vKQmTnjVw$e0iKVfwp`p2juBEAAnyzJ1
zN}_R^si9eFa;lQPoq~;iQA(PXOKS1tIn1W@R|*!LV_;z1<>}%WQgQ3e%)MUBjsgwo
z`u0ux1)qrM1Vu^)C`&jBuF=^Ndf}X#?%FM%8EcqonH+VK6V(s8T}Utq>zZ&#$??Ml
zmrlb@<KyerIPH3z*DCpAns?Eg8lP#8%iK+7`+l%$5qP)6V*7`ZxJh#@_Xf>he1dIL
zkIDqU5B2t^Jmf4LzD@A|Wn^s5m-u#>qe^d&(*{S@SyR?1ai0+WD{xKgRTtlJs|3w^
z{44k6W$?GxnAiSab@=FKZ5gqyg6APC3e-KgRz`iASE{;ewoKE_#(NGfni~2~)%#t}
z#I`D*kc!o~DJr#MQS3y483Io>N^E!h9=yp@YS~+f86v^;W&OKk7OVFxT^rdEaY*Cl
ziltu`_^yAmpJQ5TBn;h*-;`B+eCpSzYp>rLg~LRF(toFw_8-dT-F#2%WkRG|<n*(b
z3gU`-CM^{%kgTk-4%u`ir(v-Z=e?{_WtWqWC2C9TRd@G4`Q#_LZPWLHu$spHDrJF4
z&r{w%w{PYzc)jEQzuqsuGaEuCR;u{=w$FX-9vtT6R~7o-j(0_^bL>RlCqgS(R3aw+
rJellNwNo*wRHFHg$F^HpwcG{_<&Cu(CgpKV3_#%N>gTe~DWM4f;IAg=

delta 640
zcmZ3+{he!qiWFmUkh>GZx^prw85kH?(j9#r85lP9bN@+Xov5h6n6}YNfJwo^$kEcw
z#N5%q*~rq+(ACt@*uvb|)X~h*$i%|b%*=dp6_X51ktI$=+n7|igUu8)!ZY(y^2>`S
zzh*L2a5OWwaB?+wax`&s1)6N)<YMS#X<=q!WMSqA6g8ggz$~Iskz1gbl9^%!RqTvY
zaUZi&y*jT$J_7?|m#2$kNQC>_n+Nrn14Y;#*fms0Zd803EU@ut@fQ8Wr;JM!*K7#r
zR+`zW)^YX?$7#Jlqg#c4|L@F8oiX*y%R6e%{m(5aUiS9yEuY;M+aJzZy+=Uq!-hY<
z>b?28ciXO<ySsg7*(A9&^S{K;s-8ao#m-Fe>ra1`TxgzGe}n7B+uOfeuP$D_{lg-O
zF1cMFez2eR7g!*@{QA2$g%8@~lVfJp?a;fvym_AJjt8@ktM=!rzN~AoOINN8yt^>@
zv$T(Vl-%j+ma}?xfj$e{^?nt++UPyEI5VwM&%aCcriJ+RqUTIOe-1A=E<eL0*=K{~
zwpS8i+HF_661OHrtd*z_)85?u^xy{3r42`S-rXE}bVHQknlPT#qKC79%$d14Yl2<)
zroDXhqOOVebEMy#WG>qh(Px|Q<Rna<{A`BW{ph>W2QRfxJ6@D_{-&+|iFt=EAK-O2
zeXE%eyH4KiOTk|8Zz30Zinh1KKbU`4YTkw&*_XX89p3u*pLX7>OXe5!)@h#p`f>rg
p?MB}XsjB<;&3d){==AIw#<ROF{t=H#`~pm344$rjF6*2UngAmw6W#y-

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 199c8ef..ad9871b 100644
--- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
@@ -47,10 +47,14 @@ namespace
 // todo Move this to adaptor??
 #define GET_LOCALE_TEXT(string) dgettext("elementary", string)
 
+const std::string TEXT_SELECTION_POPUP_LABEL = "textselectionpopuplabel";
+
 const Dali::Vector4 DEFAULT_POPUP_DIVIDER_COLOR( Dali::Vector4( 0.23f, 0.72f, 0.8f, 0.11f ) );
 const Dali::Vector4 DEFAULT_OPTION_ICON( Dali::Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
 const Dali::Vector4 DEFAULT_OPTION_PRESSED_COLOR( Dali::Vector4( 0.24f, 0.72f, 0.8f, 0.11f ) );
 
+const float DEFAULT_CAPTION_POINT_SIZE = 8.0f; // todo This should be from the style sheet not fixed.
+
 const std::string DEFAULT_POPUP_BACKGROUND_IMAGE( DALI_IMAGE_DIR "selection-popup-bg#.png" );
 const std::string OPTION_ICON_CLIPBOARD( DALI_IMAGE_DIR "copy_paste_icon_clipboard.png" );
 const std::string OPTION_ICON_COPY( DALI_IMAGE_DIR "copy_paste_icon_copy.png" );
@@ -124,7 +128,6 @@ Dali::Toolkit::TextSelectionPopup TextSelectionPopup::New( Toolkit::TextSelectio
   Dali::Toolkit::TextSelectionPopup handle( *impl );
 
   impl->mEnabledButtons = buttonsToEnable;
-
   // Second-phase init of the implementation
   // This can only be done after the CustomActor connection has been made...
   impl->Initialize();
@@ -610,11 +613,15 @@ Dali::Image TextSelectionPopup::GetButtonImage( Toolkit::TextSelectionPopup::But
    if ( showCaption )
    {
      Toolkit::TextLabel captionTextLabel = Toolkit::TextLabel::New();
+     captionTextLabel.SetStyleName( TEXT_SELECTION_POPUP_LABEL );
      captionTextLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, caption );
+     captionTextLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, DEFAULT_CAPTION_POINT_SIZE );
      captionTextLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
 
      Toolkit::TextLabel pressedCaptionTextLabel = Toolkit::TextLabel::New();
+     pressedCaptionTextLabel.SetStyleName( TEXT_SELECTION_POPUP_LABEL );
      pressedCaptionTextLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, caption );
+     pressedCaptionTextLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, DEFAULT_CAPTION_POINT_SIZE );
      pressedCaptionTextLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
 
      Padding padding;
diff --git a/dali-toolkit/styles/dali-toolkit-default-theme.json b/dali-toolkit/styles/dali-toolkit-default-theme.json
index bc12cec..c47661f 100644
--- a/dali-toolkit/styles/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/dali-toolkit-default-theme.json
@@ -37,11 +37,14 @@ distributing this software or its derivatives.
       "font-style":"Regular",
       "point-size":18
     },
+    "textselectionpopuplabel":
+    {
+      "point-size":18
+    },
     "textselectionpopup":
     {
       "popup-max-size":[400,100],
-      "popup-min-size":[100,65],
-      "background-color":[0.0,0.0,0.0,1.0]
+      "popup-min-size":[100,65]
     },
     "textfield":
     {
diff --git a/dali-toolkit/styles/mobile/dali-toolkit-default-theme.json b/dali-toolkit/styles/mobile/dali-toolkit-default-theme.json
index a8d4c04..b4536b8 100644
--- a/dali-toolkit/styles/mobile/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/mobile/dali-toolkit-default-theme.json
@@ -90,11 +90,14 @@ distributing this software or its derivatives.
     {
       "point-size":10
     },
+    "textselectionpopuplabel":
+    {
+      "point-size":8
+    },
     "textselectionpopup":
     {
       "popup-max-size":[400,100],
-      "popup-min-size":[100,65],
-      "background-color":[0.0,0.0,0.0,1.0]
+      "popup-min-size":[100,65]
     },
     "scrollview":
     {
-- 
2.7.4