Add new style for QuickAccess button ADD

[Issue] N/A
[Problem] Bad style for ADD QuickAccess button
[Solution] Implement new style

Change-Id: I2622ffaf744e97bb1da25a9987fd296d6f9f1159

diff --git a/services/QuickAccess/QuickAccess.cpp b/services/QuickAccess/QuickAccess.cpp
index 2930ad71a62f032d8f4bb5ecfceb9a96f9c364ac..d4a910c551412ea5e6e78b4460b39c88ef76747c 100644 (file)
--- a/services/QuickAccess/QuickAccess.cpp
+++ b/services/QuickAccess/QuickAccess.cpp
@@ -100,9 +100,9 @@ void QuickAccess::createItemClasses()
     }
     if (!m_quickAccess_tile_class) {
         m_quickAccess_tile_class = elm_gengrid_item_class_new();
-        m_quickAccess_tile_class->item_style = "quickAccessAdd";
+        m_quickAccess_tile_class->item_style = "quickAccess";
         m_quickAccess_tile_class->func.text_get = nullptr;
-        m_quickAccess_tile_class->func.content_get = nullptr;
+        m_quickAccess_tile_class->func.content_get = _grid_quickaccessADD_content_get;
         m_quickAccess_tile_class->func.state_get = nullptr;
         m_quickAccess_tile_class->func.del = nullptr;
     }
@@ -426,6 +426,24 @@ Evas_Object * QuickAccess::_grid_quickaccess_content_get(void *data, Evas_Object
     return nullptr;
 }
 
+Evas_Object *QuickAccess::_grid_quickaccessADD_content_get(void *data, Evas_Object *obj, const char *part)
+{
+    BROWSER_LOGD("[%s:%d] part=%s", __PRETTY_FUNCTION__, __LINE__, part);
+    if (data) {
+        if (!strcmp(part, "elm.swallow.icon")) {
+            Evas_Object *button = elm_button_add(obj);
+            elm_object_style_set(button, "roundedrectADD");
+            elm_object_part_text_set(button, "button_text", "Add");
+            elm_layout_signal_emit(button, "show,bg,rectangle", "event");
+            setButtonColor(button, 150, 180, 255, 255);
+            return button;
+        }
+    } else {
+        BROWSER_LOGW("[%s] data = nullptr", __PRETTY_FUNCTION__);
+    }
+    return nullptr;
+}
+
 void QuickAccess::_grid_quickaccess_del(void* data, Evas_Object*)
 {
     BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
@@ -638,14 +656,14 @@ void QuickAccess::hideUI()
     }
 }
 
-void QuickAccess::setButtonColor(Evas_Object* button, int r, int b, int g, int a)
+void QuickAccess::setButtonColor(Evas_Object* button, int r, int g, int b, int a)
 {
     // setting color of inner rect
     Edje_Message_Int_Set* msg = (Edje_Message_Int_Set *) malloc(sizeof(*msg) + 3 * sizeof(int));
     msg->count = 4;
     msg->val[0] = r;
-    msg->val[1] = b;
-    msg->val[2] = g;
+    msg->val[1] = g;
+    msg->val[2] = b;
     msg->val[3] = a;
     edje_object_message_send(elm_layout_edje_get(button), EDJE_MESSAGE_INT_SET, 0, msg);
     free(msg);

diff --git a/services/QuickAccess/QuickAccess.h b/services/QuickAccess/QuickAccess.h
index 174f387b0d5ba31e4266e567f7d6bd423849be10..d22905e004375c346550fcf47247d637316be181 100644 (file)
--- a/services/QuickAccess/QuickAccess.h
+++ b/services/QuickAccess/QuickAccess.h
@@ -117,6 +117,7 @@ private:
     void deleteQuickAccessSelectedItem(Elm_Widget_Item *item);
 
     static Evas_Object * _grid_quickaccess_content_get(void *data, Evas_Object *obj, const char *part);
+    static Evas_Object * _grid_quickaccessADD_content_get(void *data, Evas_Object *obj, const char *part);
     static void _grid_quickaccess_del(void *data, Evas_Object *obj);
     static void __quckAccess_del_clicked(void *data, Evas_Object *, void *);
     static char* _grid_mostVisited_text_get(void *data, Evas_Object *obj, const char *part);
@@ -125,7 +126,7 @@ private:
     static void _thumbQuickAccessClicked(void * data, Evas_Object * obj, void * event_info);
     static void _thumbMostVisitedClicked(void * data, Evas_Object * obj, void * event_info);
     static void _check_state_changed(void *data, Evas_Object *obj, void *);
-    static void setButtonColor(Evas_Object* button, int r, int b, int g, int a);
+    static void setButtonColor(Evas_Object* button, int r, int g, int b, int a);
 
     static void _mostVisited_clicked(void * data, Evas_Object * obj, void * event_info);
     static void _quickAccess_clicked(void * data, Evas_Object * obj, void * event_info);

diff --git a/services/QuickAccess/edc/QuickAccess_mob.edc b/services/QuickAccess/edc/QuickAccess_mob.edc
index 9d033446a1c671345702bba7a7fe5939074b2c36..52cdaac0b6d4cfeec66c3d49197f2a584553ec09 100644 (file)
--- a/services/QuickAccess/edc/QuickAccess_mob.edc
+++ b/services/QuickAccess/edc/QuickAccess_mob.edc
@@ -1018,6 +1018,28 @@ group { name: "elm/button/base/roundedrect";
     }
 }
 
+group { name: "elm/button/base/roundedrectADD";
+        inherit: "elm/button/base/roundedrect";
+    images {
+        image: "internet_ic_add.png" COMP;
+    }
+    parts {
+        part { name: "center_label";
+            type: IMAGE;
+            scale: 1;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+                align: 0.5 0.5;
+                color_class: "ATO003";
+                min: 100 100;
+                max: 100 100;
+                image.normal: "internet_ic_add.png";
+                rel1 { relative: 0.0 0.0; to: "button_icon"; }
+                rel2 { relative: 1.0 1.0; to: "button_icon"; }
+            }
+        }
+    }
+}
 
 }