From: jin0.kim <jin0.kim@samsung.com>
Date: Tue, 14 Jun 2016 01:58:45 +0000 (+0830)
Subject: Fix the icon position of notification
X-Git-Tag: accepted/tizen/mobile/20160615.070457~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1de9bb57ab3673968b0a31bf2feb33cfb2b372d8;p=profile%2Fmobile%2Fapps%2Fnative%2Fquickpanel.git

Fix the icon position of notification

Change-Id: I77b76471e8d6aed100919aa15ca9bbf63b77b3a0
---

diff --git a/daemon/common.c b/daemon/common.c
index b476316..a818925 100755
--- a/daemon/common.c
+++ b/daemon/common.c
@@ -342,7 +342,7 @@ HAPI char *quickpanel_common_ui_get_appinfo_icon(const char *pkgid)
 		return NULL;
 	}
 
-	if (icon_path) {
+	if (icon_path != NULL && strlen(icon_path) > 0) {
 		icon_ret = (char*)strdup(icon_path);
 	}
 
@@ -370,7 +370,7 @@ HAPI char *quickpanel_common_ui_get_pkginfo_icon(const char *pkgid)
 		return NULL;
 	}
 
-	if (icon_path) {
+	if (icon_path != NULL && strlen(icon_path) > 0) {
 		icon_ret = (char*)strdup(icon_path);
 	}
 
diff --git a/data/quickpanel_def.h b/data/quickpanel_def.h
index 3b3cd55..adabb9c 100755
--- a/data/quickpanel_def.h
+++ b/data/quickpanel_def.h
@@ -106,7 +106,7 @@
 #define BOX_ICON_SUB_SIZE_W 29 //44
 #define BOX_ICON_SUB_SIZE_H 29 //44
 #define BOX_TEXT_TOP_PADDING 15
-#define BOX_ICON_TOP_PADDING 20
+#define BOX_ICON_TOP_PADDING 13
 
 
 #define BOX_COLOR_BG QP_THEME_ITEM_BG_COLOR
diff --git a/data/quickpanel_listitem_noti.edc b/data/quickpanel_listitem_noti.edc
index eaa105b..34d8f0f 100755
--- a/data/quickpanel_listitem_noti.edc
+++ b/data/quickpanel_listitem_noti.edc
@@ -99,7 +99,7 @@
 				scale: 1;
 				description {
 					state: "default" 0.0;
-					//min: 0 BOX_ICON_TOP_PADDING;
+					min: 0 BOX_ICON_TOP_PADDING;
 					//fixed: 0 1;
 					rel1.to:"base";
 					rel2.to:"base";
@@ -175,11 +175,11 @@
 				scale: 1;
 				description {
 					state: "default" 0.0;
-					min: QP_THEME_LIST_ITEM_NOTIFICATION_LISTTYPE_HEIGHT QP_THEME_LIST_ITEM_NOTIFICATION_LISTTYPE_HEIGHT;
-					max: QP_THEME_LIST_ITEM_NOTIFICATION_LISTTYPE_HEIGHT QP_THEME_LIST_ITEM_NOTIFICATION_LISTTYPE_HEIGHT;
+					min: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
+					max: BOX_ICON_SIZE_W BOX_ICON_SIZE_H;
 					fixed: 1 1;
 					rel1 {
-						relative: 0.0 0.0;
+						relative: 1.0 1.0;
 						to_x: "elm.padding.left.icon";
 						to_y: "elm.padding.top.icon";
 					}
diff --git a/data/quickpanel_listitem_ongoing.edc b/data/quickpanel_listitem_ongoing.edc
index b86a951..e93d2a2 100755
--- a/data/quickpanel_listitem_ongoing.edc
+++ b/data/quickpanel_listitem_ongoing.edc
@@ -178,7 +178,7 @@
 				scale: 1;
 				description {
 					state: "default" 0.0;
-					//min: 0 BOX_ICON_TOP_PADDING;
+					min: 0 BOX_ICON_TOP_PADDING;
 					//fixed: 0 1;
 					rel1.to:"base";
 					rel2.to:"base";
@@ -440,6 +440,16 @@
 					}
 					image.normal: "quick_button_icon_bg.png";
 				}
+				description {
+					state: "show" 0.0;
+					inherit: "default" 0.0;
+					visible:1;
+				}
+				description {
+					state: "hide" 0.0;
+					inherit: "default" 0.0;
+					visible:0;
+				}
 			}
 
 			part {
@@ -933,7 +943,7 @@
 				scale: 1;
 				description {
 					state: "default" 0.0;
-					//min: 0 BOX_ICON_TOP_PADDING;
+					min: 0 BOX_ICON_TOP_PADDING;
 					//fixed: 0 1;
 					rel1.to:"base";
 					rel2.to:"base";