[UI] Datetime widget style used to display time only.

Change-Id: Icee9b587c91381ee5b5643efeff7fcd66dc89511
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/include/define.h b/include/define.h
index 2568872..79543a2 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -125,6 +125,7 @@
 #define STYLE_CTXPOPUP "style.ctxpopup"
 #define STYLE_GRID_DEFAULT "style.grid.default"
 #define STYLE_DISABLE_BTN "style.disable.button"
+#define STYLE_DATETIME "style.datetime"
 
 /* Signals */
 #define SIG_FOCUSED "elm,action,focus"

diff --git a/res/widget/datetime.edc b/res/widget/datetime.edc
index 79cb70f..07b7e75 100644 (file)
--- a/res/widget/datetime.edc
+++ b/res/widget/datetime.edc
@@ -1,13 +1,14 @@
 #define SEPARATOR_WIDTH 50
 
 
-group { name: "elm/datetime/base/settings.datetime";
+group { name: "elm/datetime/base/"STYLE_DATETIME;
        parts {
                part { name: "base_bg";
                type: RECT;
                scale: 1;
-               description { state: "default" 0.0;
-                       color: 0 0 0 255;
+                       description { state: "default" 0.0;
+                               color: 0 0 0 255;
+                       }
                }
                part { name: "field0";
                        type: SWALLOW;

diff --git a/res/widget/spinner.edc b/res/widget/spinner.edc
index 6ae47a0..cef424e 100644 (file)
--- a/res/widget/spinner.edc
+++ b/res/widget/spinner.edc
@@ -2,7 +2,7 @@
 #define IMAGE_ICON_DOWN "btn_option_arrow_sel.png"
 #define GLIDE_EASE_OUT(duration) CUBIC_BEZIER (duration) 0.25 0.46 0.45 1.0
 
-group { name: "elm/button/base/spinner/increase/settings.datetime";
+group { name: "elm/button/base/spinner/increase/"STYLE_DATETIME;
        data.item: "focus_highlight" "on";
        data.item: "vector_ux" "no_bg";
        data.item: "corner_radius" "10";
@@ -313,8 +313,8 @@ group { name: "elm/button/base/spinner/increase/settings.datetime";
        }
 }
 
-group { name: "elm/button/base/spinner/decrease/settings.datetime";
-       inherit: "elm/button/base/spinner/increase/settings.datetime";
+group { name: "elm/button/base/spinner/decrease/"STYLE_DATETIME;
+       inherit: "elm/button/base/spinner/increase/"STYLE_DATETIME;
        images {
                image: "core_icon_picker_arrow_down.png" COMP;
        }
@@ -349,7 +349,7 @@ group { name: "elm/button/base/spinner/decrease/settings.datetime";
        }
 }
 
-group { name: "elm/button/base/spinner/settings.datetime";
+group { name: "elm/button/base/spinner/"STYLE_DATETIME;
        script {
                public mouse_down = 0;
                public multi_down = 0;
@@ -547,7 +547,7 @@ group { name: "elm/button/base/spinner/settings.datetime";
        }
 }
 
-group { name: "elm/spinner/base/settings.datetime";
+group { name: "elm/spinner/base/"STYLE_DATETIME;
        parts {
                part { name: "bg";
                        type: SPACER;
@@ -706,7 +706,7 @@ group { name: "elm/spinner/base/settings.datetime";
        }
 }
 
-//group { name: "elm/spinner/base/settings.datetime";
+//group { name: "elm/spinner/base/"STYLE_DATETIME;
 //     parts {
 //             part { name: "bg";
 //                     type: RECT;

diff --git a/src/view/common/view_datetime.c b/src/view/common/view_datetime.c
index 891ff7b..e1074b7 100644 (file)
--- a/src/view/common/view_datetime.c
+++ b/src/view/common/view_datetime.c
@@ -17,6 +17,7 @@
 #include <app.h>
 #include <Elementary.h>
 
+#include "define.h"
 #include "app_debug.h"
 #include "app_string.h"
 #include "common/inputmgr.h"
@@ -41,6 +42,14 @@ static input_handler datetime_btn_handler = {
        .focused = _datetime_btn_focused_cb,
 };
 
+void TEST_show_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+       SETTING_TRACE_BEGIN;
+
+       _dbg_datetime(obj);
+       SETTING_TRACE_END;
+}
+
 Evas_Object *view_datetime_create(Evas_Object *parent, const char *part, bool is_date)
 {
        Eina_Bool field_year = is_date;
@@ -57,6 +66,8 @@ Evas_Object *view_datetime_create(Evas_Object *parent, const char *part, bool is
                return NULL;
        }
 
+       elm_object_style_set(datetime, STYLE_DATETIME);
+
        _set_spinner_style(datetime);
        _dbg_datetime(datetime);
        _set_spinner_btn_callbacks(datetime, 0, 2);
@@ -64,11 +75,12 @@ Evas_Object *view_datetime_create(Evas_Object *parent, const char *part, bool is
        _dbg_focus_chain(datetime, 0, 2);
 
        elm_datetime_format_set(datetime, "%d/%b/%Y");
+       evas_object_event_callback_add(datetime, EVAS_CALLBACK_SHOW, TEST_show_cb, NULL);
 
        return datetime;
 }
 
-static void _set_spinner_button_style(Evas_Object *spinner, char *part_name, int height)
+static void _set_spinner_button_height(Evas_Object *spinner, char *part_name, int height)
 {
        Evas_Object *part = NULL;
 
@@ -98,7 +110,7 @@ static void _dbg_datetime(Evas_Object *datetime)
                }
 
                const char *spinner_style = elm_object_style_get(spinner);
-               Evas_Object *btn = elm_object_part_content_get(datetime, "elm.swallow.inc_button");
+               Evas_Object *btn = elm_object_part_content_get(spinner, "elm.swallow.inc_button");
                const char *inc_style =  elm_object_style_get(btn);
                btn = elm_object_part_content_get(spinner, "elm.swallow.dec_button");
                const char *dec_style =  elm_object_style_get(btn);
@@ -118,9 +130,7 @@ static void _set_spinner_style(Evas_Object *datetime)
        int i;
        Evas_Object *spinner;
 
-       elm_object_style_set(datetime, "settings.datetime");
-
-       for (i = 0; i < 10; ++i) {
+       for (i = 0; i < 5; ++i) {
                char buf[255];
                snprintf(buf, 255, "field%d", i);
 
@@ -131,12 +141,12 @@ static void _set_spinner_style(Evas_Object *datetime)
                }
 
                elm_spinner_editable_set(spinner, EINA_FALSE);
-               elm_object_style_set(spinner, "settings.datetime");
+               elm_object_style_set(spinner, STYLE_DATETIME);
 
-               _set_spinner_button_style(spinner, NULL, 100);
-               _set_spinner_button_style(spinner, "elm.swallow.inc_button", 20);
-               _set_spinner_button_style(spinner, "elm.swallow.dec_button", 20);
-               _set_spinner_button_style(spinner,"elm.swallow.text_button", 60);
+               _set_spinner_button_height(spinner, NULL, 100);
+               _set_spinner_button_height(spinner, "elm.swallow.inc_button", 20);
+               _set_spinner_button_height(spinner, "elm.swallow.dec_button", 20);
+               _set_spinner_button_height(spinner,"elm.swallow.text_button", 60);
        }
 }
 
@@ -213,7 +223,7 @@ static void _datetime_btn_clicked_cb(int id, void *data, Evas_Object *obj)
                        elm_object_focus_next(obj, ELM_FOCUS_RIGHT);
        }
 
-       dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] CLICKED", __FILE__, __LINE__);
+       dlog_print(DLOG_DEBUG, LOG_TAG, "[%s:%d] CLICKED style: %s", __FILE__, __LINE__, elm_object_style_get(spinner));
 }
 
 static void _datetime_btn_unfocused_cb(int id, void *data, Evas_Object *obj, Elm_Object_Item *item)