Fix to draw the text issue

Change-Id: I00237409b50fe2d8da2093b069d12b970bc4621f
Signed-off-by: Taejin Woo <tt.woo@samsung.com>

diff --git a/data/custom_popup_w.edc b/data/custom_popup_w.edc
index 62679e4..a51a6d4 100644 (file)
--- a/data/custom_popup_w.edc
+++ b/data/custom_popup_w.edc
@@ -39,7 +39,7 @@
 #define BUTTON_HEIGHT 85
 
 collections {
-#include "groups/passkey_confirm.edc"
+base_scale: 1.3;
 #include "groups/auth_popup.edc"
 #include "groups/passwd_popup.edc"
 #include "groups/passkey_confirm_popup.edc"

diff --git a/data/groups/passkey_confirm_popup.edc b/data/groups/passkey_confirm_popup.edc
index 3df4bb7..dcd75e7 100644 (file)
--- a/data/groups/passkey_confirm_popup.edc
+++ b/data/groups/passkey_confirm_popup.edc
@@ -14,12 +14,148 @@
  *  limitations under the License.
  *
  */
+#define BG_COLOR       0 0 0 255
+
+#define PART(TYPE, NAME, DESCRIPION) \
+       part { \
+               name: NAME; \
+               type: TYPE; \
+               scale: 1; \
+               DESCRIPION \
+       }
+#define POPUP_BASE_DEFAULT_MIN_INC                         360 360
+#define POPUP_LEFT_RIGHT_PADDING_WIDTH_INC         33
+#define POPUP_TOP_PADDING_HEIGHT_INC               110
+#define POPUP_TOP_PADDING_NOTITLE_HEIGHT_INC       76
+#define POPUP_BOTTOM_PADDING_HEIGHT_INC            111
+#define POPUP_TITLE_BOTTOM_PADDING_HEIGHT_INC      8
+#define POPUP_TITLE_TEXT_SIZE_INC                          30
+#define POPUP_BODY_TEXT_SIZE_INC                           34
 
 images {
        image: "b_setup_wizard_bluetooth_pairing.png" COMP;
 }
-
-#define BG_COLOR       0 0 0 255
+styles {
+       style {
+               name: "popup_title_style";
+               base: "font=Tizen:style=Regular font_size="32" color=#FFFFFF color_class=AT011 align=center wrap=mixed text_class=AT011";
+       }
+       style {
+               name: "popup_body_default_font_style";
+               base: "font=Tizen:style=Regular font_size="28" color=#FFFFFF color_class=AT018 align=center wrap=mixed text_class=AT018";
+       }
+}
+group { name: "no_button_passkey_confirm_popup";
+       limits {
+               vertical: "content_area" "360";
+       }
+       parts {
+               part { name: "bg";
+                       type: SPACER;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: POPUP_BASE_DEFAULT_MIN_INC;
+                       }
+               }
+               part {
+                       name: "top.left.padding";
+                       type: SPACER;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: POPUP_LEFT_RIGHT_PADDING_WIDTH_INC POPUP_TOP_PADDING_HEIGHT_INC;
+                               rel1.to: "bg";
+                               rel2 {
+                                       to: "bg";
+                                       relative: 0.0 0.0;
+                               }
+                               align: 0.0 0.0;
+                               fixed: 1 1;
+                       }
+               }
+               part {
+                       name: "bottom.right.padding";
+                       type: SPACER;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: POPUP_LEFT_RIGHT_PADDING_WIDTH_INC POPUP_BOTTOM_PADDING_HEIGHT_INC;
+                               rel1 {
+                                       to: "bg";
+                                       relative: 1.0 1.0;
+                               }
+                               rel2.to: "bg";
+                               align: 1.0 1.0;
+                               fixed: 1 1;
+                       }
+                       description {
+                               state: "center_align" 0.0;
+                               inherit: "default" 0.0;
+                               min: POPUP_LEFT_RIGHT_PADDING_WIDTH_INC POPUP_TOP_PADDING_NOTITLE_HEIGHT_INC;
+                       }
+               }
+               part {
+                       name: "elm.text1";
+                       type: TEXTBLOCK;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               rel1 {
+                                       to: "top.left.padding";
+                                       relative: 1.0 1.0;
+                               }
+                               rel2 {
+                                       to_x: "bottom.right.padding";
+                                       to_y: "top.left.padding";
+                                       relative: 0.0 1.0;
+                               }
+                               align: 0.5 0.0;
+                               fixed: 0 1;
+                               text {
+                                       style: "popup_title_style";
+                                       min: 0 1;
+                               }
+                       }
+               }
+               part {
+                       name: "text1.bottom.padding";
+                       type: SPACER;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: 0 POPUP_TITLE_BOTTOM_PADDING_HEIGHT_INC;
+                               rel1 {
+                                       to: "elm.text1";
+                                       relative: 0.0 1.0;
+                               }
+                               rel2.to: "elm.text1";
+                               align: 0.5 0.0;
+                               fixed: 0 1;
+                       }
+               }
+               part {
+                       name: "elm.text2";
+                       type: TEXTBLOCK;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               rel1 {
+                                       to: "text1.bottom.padding";
+                                       relative: 0.0 1.0;
+                               }
+                               rel2 {
+                                       to: "bottom.right.padding";
+                                       relative: 0.0 0.0;
+                               }
+                               text {
+                                       style: "popup_body_default_font_style";
+                                       min: 0 1;
+                               }
+                       }
+               }
+       }
+}
 
 group { name: "passkey_confirm_popup";
        parts {
@@ -247,3 +383,151 @@ group { name: "elm/button/base/custom_focus_style";
        }
 }
 
+group { name: "popup_checkview_internal";
+   parts {
+      part { name: "label";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel2.relative: 1.0 0.0;
+            fixed: 0 1;
+            align: 0.5 0.0;
+         }
+      }
+      part { name: "bottom_pad";
+         type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            min: 0 4;
+            rel1 {
+               to: "label";
+               relative: 0.0 1.0;
+            }
+            rel2.to: "label";
+            align: 0.5 0.0;
+            fixed: 0 1;
+         }
+      }
+      part { name: "check";
+         type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1 {
+               to: "bottom_pad";
+               relative: 0.0 1.0;
+            }
+         }
+      }
+   }
+}
+
+group {
+       name: "entry_layout";
+       parts {
+               part {
+                       name: "base";
+                       type: SPACER;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: 360 0;
+                       }
+               }
+
+               part {
+                       name: "content_top_padding";
+                       type: SPACER;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: 0 44;
+                               fixed: 0 1;
+                               align: 0.0 0.0;
+                               rel1 {
+                                       to_x: "content_left_padding";
+                                       relative: 1.0 0.0;
+                               }
+                               rel2 {
+                                       to_x: "content_right_padding";
+                                       relative: 0.0 0.0;
+                               }
+                       }
+               }
+
+               part {
+                       name: "content_left_padding";
+                       type: SPACER;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: 78 0;
+                               fixed: 1 0;
+                               align: 0.0 0.0;
+                               rel1 {
+                                       to: "base";
+                                       relative: 0.0 0.0;
+                               }
+                               rel2 {
+                                       to: "base";
+                                       relative: 0.0 1.0;
+                               }
+                       }
+               }
+
+               part {
+                       name: "content_right_padding";
+                       type: SPACER;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: 78 0;
+                               fixed: 1 0;
+                               align: 1.0 0.0;
+                               rel1 {
+                                       to: "base";
+                                       relative: 1.0 0.0;
+                               }
+                               rel2 {
+                                       to: "base";
+                                       relative: 1.0 1.0;
+                               }
+                       }
+               }
+
+               part {
+                       name: "content_bg";
+                       type: SPACER;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: 0 45;
+                               fixed: 0 1;
+                               align: 0.0 0.0;
+                               rel1 {
+                                       to_x: "content_left_padding";
+                                       to_y: "content_top_padding";
+                                       relative: 1.0 1.0;
+                               }
+                               rel2 {
+                                       to_x: "content_right_padding";
+                                       to_y: "content_top_padding";
+                                       relative: 0.0 1.0;
+                               }
+                       }
+               }
+
+               part {
+                       name: "elm.swallow.content";
+                       type: SWALLOW;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: 0 45;
+                               fixed: 1 1;
+                               align: 0.0 0.0;
+                               rel1.to: "content_bg";
+                               rel2.to: "content_bg";
+                       }
+               }
+       }
+}
\ No newline at end of file

diff --git a/src/bt-syspopup-w.h b/src/bt-syspopup-w.h
index fd6624a..e229240 100644 (file)
--- a/src/bt-syspopup-w.h
+++ b/src/bt-syspopup-w.h
@@ -26,13 +26,8 @@
 #include <dbus/dbus-glib.h>
 #include <efl_extension.h>
 
-#ifndef PACKAGE_NAME
-#define PACKAGE_NAME "org.tizen.bt-syspopup"
-#endif
-
-#ifndef PREFIX
-#define PREFIX "/usr/apps"PACKAGE_NAME
-#endif
+#define BT_PACKAGE_NAME "org.tizen.bt-syspopup"
+#define BT_PREFIX "/usr/apps/"BT_PACKAGE_NAME
 
 #define EXPORT __attribute__((visibility("default")))
 
@@ -40,10 +35,10 @@
 
 #define PACKAGE                "bt-syspopup"
 #define APPNAME                "bt-syspopup"
-#define ICON_DIR       PREFIX"/res/default/small/icon"
+#define ICON_DIR       BT_PREFIX"/res/default/small/icon"
 
-#define CUSTOM_POPUP_PATH PREFIX"/res/edje/custom_popup.edj"
-#define POPUP_IMAGE_PATH PREFIX"/res/images"
+#define CUSTOM_POPUP_PATH BT_PREFIX"/res/edje/custom_popup.edj"
+#define POPUP_IMAGE_PATH BT_PREFIX"/res/images"
 
 #define BT_COMMON_PKG          "bluetooth"
 #define BT_LOCALEDIR           "/usr/apps/org.tizen.bluetooth/res/locale"

diff --git a/tables/org.tizen.bt-syspopup_FontInfoTable.xml b/tables/org.tizen.bt-syspopup_FontInfoTable.xml
index 330fe98..ecc8585 100644 (file)
--- a/tables/org.tizen.bt-syspopup_FontInfoTable.xml
+++ b/tables/org.tizen.bt-syspopup_FontInfoTable.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FontInfoTable>
+       <FontInfo id="AT011" style="L" size="32" />
        <FontInfo id="AT012" style="R" size="32" />
        <FontInfo id="AT013" style="R" size="36" />
        <FontInfo id="AT0131" style="R" size="32" />
        <FontInfo id="AT0132" style="R" size="32" />
+       <FontInfo id="AT018" style="L" size="28" />
 </FontInfoTable>