From df4b2c990571a240bab935fcf9e184331cc72555 Mon Sep 17 00:00:00 2001 From: Jihoon Chung Date: Sat, 28 Sep 2013 13:26:21 +0900 Subject: [PATCH] UX change of check box usage in permission request popup [Issue#] N/A [Problem] New UX concept is applied to check box in the permission request popup [Cause] N/A [Solution] The relevant implementation is already done in the elementary library layer. - To use elemetary implementation, remove "elm,text" in the WRT. - After clean-up "elm,text", text will be attached to check box evas_object. [Remarks] * Previous concept: toggle when user click check box area only. * New concept: toggle check box even though user selects text area beside check box. [SCMRequest] N/A Change-Id: I725a258375f2d937cee342fbaa0784711caad0c2 --- data/Wrt.edc | 19 ------------------- src/view/common/view_logic_certificate_support.cpp | 4 +++- .../common/view_logic_security_origin_support.cpp | 4 +++- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/data/Wrt.edc b/data/Wrt.edc index 125c13f..280223a 100644 --- a/data/Wrt.edc +++ b/data/Wrt.edc @@ -104,25 +104,6 @@ collections { rel2 { relative: 0.1 0.8; to: "bg"; } } } - part{ - name:"elm.text"; - type: TEXT; - scale : 1; - description { - state: "default" 0.0; - visible: 1; - color: 255 255 255 255; - text { - font: "Tizen:style=Medium"; - size: 35; - align: 0.0 0.5; - } - align: 0.0 0.5; - fixed: 1 1; - rel1 { relative: 1.0 0.0; to: "elm.swallow.checkbox"; } - rel2 { relative: 1.0 1.0; to_y: "elm.swallow.checkbox"; } - } - } } //end of parts } //end of group diff --git a/src/view/common/view_logic_certificate_support.cpp b/src/view/common/view_logic_certificate_support.cpp index 30fc12e..96a8a09 100644 --- a/src/view/common/view_logic_certificate_support.cpp +++ b/src/view/common/view_logic_certificate_support.cpp @@ -117,7 +117,9 @@ Evas_Object* CertificateSupportUtil::createPopup( elm_object_text_set(label, bodyText); Evas_Object* check = elm_check_add(scroller); - elm_object_part_text_set(layout, "elm.text", checkText); + elm_object_text_set(check, checkText); + evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_part_content_set(layout, "elm.swallow.checkbox", check); elm_object_content_set(scroller, label); diff --git a/src/view/common/view_logic_security_origin_support.cpp b/src/view/common/view_logic_security_origin_support.cpp index 0bab2f3..db7e90a 100644 --- a/src/view/common/view_logic_security_origin_support.cpp +++ b/src/view/common/view_logic_security_origin_support.cpp @@ -146,7 +146,9 @@ Evas_Object* SecurityOriginSupportUtil::createPopup( elm_object_text_set(label, bodyText); Evas_Object* check = elm_check_add(scroller); - elm_object_part_text_set(layout, "elm.text", checkText); + elm_object_text_set(check, checkText); + evas_object_size_hint_align_set(check, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_object_part_content_set(layout, "elm.swallow.checkbox", check); elm_object_content_set(scroller, label); -- 2.7.4