progressbar: fix align issue.

adjusting the default alignment to center.

Change-Id: Ic32a8557a4efc8d2908dfe219a5f33700e2e7006
Signed-off-by: Bowon Ryu <bowon.ryu@samsung.com>

1 files changed, 85 insertions, 11 deletions

diff --git a/mobile/widgets/progressbar.edc b/mobile/widgets/progressbar.edc
index 8ec460ba..c63ef3e9 100644
--- a/mobile/widgets/progressbar.edc
+++ b/mobile/widgets/progressbar.edc
@@ -203,7 +203,16 @@
          spacer { "base";
             scale;
             desc { "default";
-               min: 0 PROGRESSBAR_DEFAULT_HEIGHT_INC;
+                 min: 0 (PROGRESSBAR_DEFAULT_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC);
+                 max: -1 (PROGRESSBAR_DEFAULT_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC);
+            }
+            desc { "base_with_one_text";
+                 min: 0 (PROGRESSBAR_DEFAULT_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_DEFAULT_TEXT_HEIGHT_INC);
+                 max: -1 (PROGRESSBAR_DEFAULT_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_DEFAULT_TEXT_HEIGHT_INC);
+            }
+            desc { "base_with_two_text";
+                 min: 0 (PROGRESSBAR_DEFAULT_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_DEFAULT_TEXT_HEIGHT_INC + PROGRESSBAR_DEFAULT_TEXT_HEIGHT_INC);
+                 max: -1 (PROGRESSBAR_DEFAULT_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_DEFAULT_TEXT_HEIGHT_INC + PROGRESSBAR_DEFAULT_TEXT_HEIGHT_INC);
             }
          }
          rect { "bg_base";
@@ -229,7 +238,7 @@
          text { "elm.text.top.right";
             scale;
             desc { "default";
-               fixed: 1 1;
+               fixed: 0 1;
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 0.0;
                rel1.to: "base";
@@ -260,7 +269,6 @@
             scale;
             desc { "default";
                min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               max: -1 PROGRESSBAR_PADDING_HEIGHT_INC;
                fixed: 0 1;
                rel.to: "elm.text.top.right";
                rel1.relative: 0.0 1.0;
@@ -273,7 +281,6 @@
             desc { "default";
                image.normal: "core_progress_bar.#";
                min: 0 PROGRESSBAR_DEFAULT_HEIGHT_INC;
-               max: -1 PROGRESSBAR_DEFAULT_HEIGHT_INC;
                fixed: 0 1;
                color_class: "progressbar/default/bg";
                rel.to: "padding_top";
@@ -399,7 +406,6 @@
             scale;
             desc { "default";
                min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               max: -1 PROGRESSBAR_PADDING_HEIGHT_INC;
                fixed: 0 1;
                rel.to: "bg_progressbar";
                rel1.relative: 0.0 1.0;
@@ -421,6 +427,7 @@
                   font: "Tizen:weight=Normal"; size: "32";
                   text_class: "tizen";
                }
+               fixed: 0 1;
                align: 0.0 0.0;
                color_class: "progressbar/default/text_bottom_left";
                hid;
@@ -450,6 +457,7 @@
                   font: "Tizen:weight=Normal"; size: "32";
                   text_class: "tizen";
                }
+               fixed: 0 1;
                align: 1.0 0.0;
                color_class: "progressbar/default/text_bottom_right";
                hid;
@@ -479,6 +487,7 @@
                   font: "Tizen:weight=Normal"; size: "32";
                   text_class: "tizen";
                }
+               fixed: 0 1;
                align: 1.0 0.0;
                color_class: "progressbar/default/text_bottom_right";
                hid;
@@ -545,6 +554,26 @@
          }
       }
       programs {
+         program { "base_size_set";
+            script {
+               if (!get_int(text_top_right_show)) {
+                  if (get_int(text_bottom_left_show)
+                      + get_int(text_bottom_right_show)
+                      + get_int(text_status_show) == 0)
+                     set_state(PART:"base", "default", 0.0);
+                  else
+                     set_state(PART:"base", "base_with_one_text", 0.0);
+               }
+               else {
+                  if (get_int(text_bottom_left_show)
+                      + get_int(text_bottom_right_show)
+                      + get_int(text_status_show) == 0)
+                     set_state(PART:"base", "base_with_one_text", 0.0);
+                  else
+                     set_state(PART:"base", "base_with_two_text", 0.0);
+               }
+            }
+         }
          program { "on_visible_top_right";
             script {
                set_int(text_top_right_show, SHOW);
@@ -553,12 +582,14 @@
                } else {
                   set_state(PART:"elm.text.top.right", "disabled_visible", 0.0);
                }
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_hidden_top_right";
             script {
                set_int(text_top_right_show, HIDE);
                set_state(PART:"elm.text.top.right", "default", 0.0);
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_visible_bottom_left";
@@ -569,12 +600,14 @@
                } else {
                   set_state(PART:"elm.text.bottom.left", "disabled_visible", 0.0);
                }
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_hidden_bottom_left";
             script {
                set_int(text_bottom_left_show, HIDE);
                set_state(PART:"elm.text.bottom.left", "default", 0.0);
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_visible_bottom_right";
@@ -588,12 +621,14 @@
                   set_state(PART:"elm.text.status", "default", 0.0);
                   set_state(PART:"elm.text.bottom.right", "disabled_visible", 0.0);
                }
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_hidden_bottom_right";
             script {
                set_int(text_bottom_right_show, HIDE);
                set_state(PART:"elm.text.bottom.right", "default", 0.0);
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_visible_units";
@@ -607,12 +642,14 @@
                   set_state(PART:"elm.text.bottom.right", "default", 0.0);
                   set_state(PART:"elm.text.status", "disabled_visible", 0.0);
                }
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_hidden_units";
             script {
                set_int(text_status_show, HIDE);
                set_state(PART:"elm.text.status", "default", 0.0);
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "slide_to_end";
@@ -831,7 +868,16 @@
          spacer { "base";
             scale;
             desc { "default";
-               min: 0 PROGRESSBAR_PENDING_HEIGHT_INC;
+               min: 0 (PROGRESSBAR_PENDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC);
+               max: -1 (PROGRESSBAR_PENDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC);
+            }
+            desc { "base_with_one_text";
+               min: 0 (PROGRESSBAR_PENDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PENDING_TEXT_HEIGHT_INC);
+               max: -1 (PROGRESSBAR_PENDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PENDING_TEXT_HEIGHT_INC);
+            }
+            desc { "base_with_two_text";
+               min: 0 (PROGRESSBAR_PENDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PENDING_TEXT_HEIGHT_INC + PROGRESSBAR_PENDING_TEXT_HEIGHT_INC);
+               max: -1 (PROGRESSBAR_PENDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PADDING_HEIGHT_INC + PROGRESSBAR_PENDING_TEXT_HEIGHT_INC + PROGRESSBAR_PENDING_TEXT_HEIGHT_INC);
             }
          }
          rect { "bg_base";
@@ -853,11 +899,10 @@
                hid;
             }
          }
-
          text { "elm.text.top.right";
             scale;
             desc { "default";
-               fixed: 1 1;
+               fixed: 0 1;
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 0.0;
                rel1.to: "base";
@@ -888,7 +933,6 @@
             scale;
             desc { "default";
                min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               max: -1 PROGRESSBAR_PADDING_HEIGHT_INC;
                fixed: 0 1;
                rel.to: "elm.text.top.right";
                rel1.relative: 0.0 1.0;
@@ -900,7 +944,6 @@
             scale;
             desc { "default";
                min: 0 PROGRESSBAR_PENDING_HEIGHT_INC;
-               max: -1 PROGRESSBAR_PENDING_HEIGHT_INC;
                fixed: 0 1;
                image.normal: "core_progress_bar.#";
                color_class: "progressbar/pending/bg";
@@ -938,7 +981,6 @@
             scale;
             desc { "default";
                min: 0 PROGRESSBAR_PADDING_HEIGHT_INC;
-               max: -1 PROGRESSBAR_PADDING_HEIGHT_INC;
                fixed: 0 1;
                rel1.to: "bg_progressbar";
                rel2.to: "bg_progressbar";
@@ -961,6 +1003,7 @@
                   font: "Tizen:weight=Normal"; size: "32";
                   text_class: "tizen";
                }
+               fixed: 0 1;
                align: 0.0 0.0;
                color_class: "progressbar/pending/text_bottom_left";
                hid;
@@ -990,6 +1033,7 @@
                   font: "Tizen:weight=Normal"; size: "32";
                   text_class: "tizen";
                }
+               fixed: 0 1;
                align: 1.0 0.0;
                color_class: "progressbar/pending/text_status";
                hid;
@@ -1019,6 +1063,7 @@
                   font: "Tizen:weight=Normal"; size: "32";
                   text_class: "tizen";
                }
+               fixed: 0 1;
                align: 1.0 0.0;
                color_class: "progressbar/pending/text_bottom_right";
                hid;
@@ -1082,6 +1127,26 @@
          }
       }
       programs {
+         program { "base_size_set";
+            script {
+               if (!get_int(text_top_right_show)) {
+                  if (get_int(text_bottom_left_show)
+                      + get_int(text_bottom_right_show)
+                      + get_int(text_status_show) == 0)
+                     set_state(PART:"base", "default", 0.0);
+                  else
+                     set_state(PART:"base", "base_with_one_text", 0.0);
+               }
+               else {
+                  if (get_int(text_bottom_left_show)
+                      + get_int(text_bottom_right_show)
+                      + get_int(text_status_show) == 0)
+                     set_state(PART:"base", "base_with_one_text", 0.0);
+                  else
+                     set_state(PART:"base", "base_with_two_text", 0.0);
+               }
+            }
+         }
          program { "on_visible_top_right";
             script {
                set_int(text_top_right_show, SHOW);
@@ -1090,12 +1155,14 @@
                } else {
                   set_state(PART:"elm.text.top.right", "disabled_visible", 0.0);
                }
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_hidden_top_right";
             script {
                set_int(text_top_right_show, HIDE);
                set_state(PART:"elm.text.top.right", "default", 0.0);
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_visible_bottom_left";
@@ -1106,17 +1173,20 @@
                } else {
                   set_state(PART:"elm.text.bottom.left", "disabled_visible", 0.0);
                }
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_hidden_bottom_left";
             script {
                set_int(text_bottom_left_show, HIDE);
                set_state(PART:"elm.text.bottom.left", "default", 0.0);
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_visible_bottom_right";
             script {
                set_int(text_bottom_right_show, SHOW);
+               set_int(text_status_show, HIDE);
                if (get_int(enabled)) {
                   set_state(PART:"elm.text.status", "default", 0.0);
                   set_state(PART:"elm.text.bottom.right", "visible", 0.0);
@@ -1124,12 +1194,14 @@
                   set_state(PART:"elm.text.status", "default", 0.0);
                   set_state(PART:"elm.text.bottom.right", "disabled_visible", 0.0);
                }
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_hidden_bottom_right";
             script {
                set_int(text_bottom_right_show, HIDE);
                set_state(PART:"elm.text.bottom.right", "default", 0.0);
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_visible_units";
@@ -1143,12 +1215,14 @@
                   set_state(PART:"elm.text.bottom.right", "default", 0.0);
                   set_state(PART:"elm.text.status", "disabled_visible", 0.0);
                }
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "on_hidden_units";
             script {
                set_int(text_status_show, HIDE);
                set_state(PART:"elm.text.status", "default", 0.0);
+               run_program(PROGRAM:"base_size_set");
             }
          }
          program { "slide_to_end";