hermet pushed a commit to branch elementary-1.12.

http://git.enlightenment.org/core/elementary.git/commit/?id=1404fa9a1b295a3da337ed6b23f00c7d9efcd4b7

commit 1404fa9a1b295a3da337ed6b23f00c7d9efcd4b7
Author: Jee-Yong Um <jc9...@samsung.com>
Date:   Fri Dec 19 14:27:00 2014 +0900

    elm_colorselector: fix not intended duplication
    
    Summary:
    When colorselector widget is added, there are two align set command on 
palette_box part,
    but that for picker part is omitted.
    Apply elm_box_align_set function to picker part correctly.
    
    @fix
    
    Reviewers: Hermet
    
    Reviewed By: Hermet
    
    Subscribers: Hermet
    
    Differential Revision: https://phab.enlightenment.org/D1790
    
    Conflicts:
    
        AUTHORS
---
 AUTHORS                     | 1 +
 src/lib/elm_colorselector.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index ec475be..5a6f1d8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -159,3 +159,4 @@ Jae Yong Hwang <j_yong.hw...@samsung.com>
 Kabeer Khan <kabeer.k...@samsung.com>
 yinsc <shouchen....@samsung.com>
 Woochan Lee <wc0917....@samsung.com>
+Jee-Yong Um <con...@gmail.com>
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 4250243..e0763a4 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1553,7 +1553,7 @@ _elm_colorselector_evas_object_smart_add(Eo *obj, 
Elm_Colorselector_Data *priv)
    elm_box_padding_set(priv->picker,
                        (h_pad * elm_widget_scale_get(obj) * 
elm_config_scale_get()),
                        (v_pad * elm_widget_scale_get(obj) * 
elm_config_scale_get()));
-   elm_box_align_set(priv->palette_box, 0.5, 0.5);
+   elm_box_align_set(priv->picker, 0.5, 0.5);
 
    priv->mode = ELM_COLORSELECTOR_BOTH;
    priv->focused = ELM_COLORSELECTOR_PALETTE;

-- 


Reply via email to