movie: use app_contents_get_color for backgroud colorsubmit/tizen/20150807.083626accepted/tizen/tv/20150808.025831

Change-Id: I50ab6109e6b20af0b51325f9451e2ab8d146188d
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

2 files changed, 38 insertions, 59 deletions

diff --git a/res/edc/widgets/button.edc b/res/edc/widgets/button.edc
index b896e15..c70891d 100644
--- a/res/edc/widgets/button.edc
+++ b/res/edc/widgets/button.edc
@@ -1310,7 +1310,7 @@ group {
 				state: "default" 0.0;
 				rel1.to: "bg";
 				rel2 {
-					to: "bg_text";
+					to: PART_RECENT_CONTENT_TEXTBG;
 					relative: 1.0 0.0;
 				}
 				map {
@@ -1455,7 +1455,7 @@ group {
 					relative: 0.0 1.0;
 				}
 				rel2 {
-					to: "bg_text";
+					to: PART_RECENT_CONTENT_TEXTBG;
 					relative: 0.0 0.0;
 				}
 				min: 6 0;
@@ -1493,7 +1493,7 @@ group {
 					relative: 1.0 1.0;
 				}
 				rel2 {
-					to: "bg_text";
+					to: PART_RECENT_CONTENT_TEXTBG;
 					relative: 1.0 0.0;
 				}
 				min: 6 0;
@@ -1520,8 +1520,8 @@ group {
 			}
 		}
 		part {
-			name: "defaultbg_text";
-			type: RECT;
+			name: PART_RECENT_CONTENT_TEXTBG;
+			type: SWALLOW;
 			scale: 1;
 			description {
 				state: "default" 0.0;
@@ -1535,29 +1535,22 @@ group {
 				}
 				min: 0 198;
 				align: 0.5 1.0;
-				color: COLOR_TEXT_BG;
 				fixed: 0 1;
 				map {
 					perspective_on: 1;
 					perspective: "map";
 				}
 			}
-			description {
-				state: "selected" 0.0;
-				inherit: "default" 0.0;
-				color: COLOR_ITEM_FOCUS;
-				map.on: 1;
-			}
 		}
 		part {
-			name: "bg_text";
+			name: "defaultbg_text";
 			type: RECT;
 			scale: 1;
 			description {
 				state: "default" 0.0;
-				rel1.to: "defaultbg_text";
-				rel2.to: "defaultbg_text";
-				color: COLOR_TEXT_BG;
+				rel1.to: PART_RECENT_CONTENT_TEXTBG;
+				rel2.to: PART_RECENT_CONTENT_TEXTBG;
+				visible: 0;
 				map {
 					perspective_on: 1;
 					perspective: "map";
@@ -1566,6 +1559,7 @@ group {
 			description {
 				state: "selected" 0.0;
 				inherit: "default" 0.0;
+				visible: 1;
 				color: COLOR_ITEM_FOCUS;
 				map.on: 1;
 			}
@@ -1581,9 +1575,9 @@ group {
 			scale: 1;
 			description {
 				state: "default" 0.0;
-				rel1.to: "bg_text";
+				rel1.to: PART_RECENT_CONTENT_TEXTBG;
 				rel2 {
-					to: "bg_text";
+					to: PART_RECENT_CONTENT_TEXTBG;
 					relative: 0.0 0.0;
 				}
 				min: 26 28;
@@ -1598,11 +1592,11 @@ group {
 			description {
 				state: "default" 0.0;
 				rel1 {
-					to: "bg_text";
+					to: PART_RECENT_CONTENT_TEXTBG;
 					relative: 1.0 0.0;
 				}
 				rel2 {
-					to: "bg_text";
+					to: PART_RECENT_CONTENT_TEXTBG;
 					relative: 1.0 0.0;
 				}
 				min: 26 28;
@@ -1847,7 +1841,7 @@ group {
 			target: "part_focus1";
 			target: "part_focus2";
 			target: "part_focus3";
-			target: "bg_text";
+			target: "defaultbg_text";
 			target: PART_RECENT_CONTENT_TITLE;
 			target: PART_RECENT_CONTENT_DATE;
 			after: "focus,in,anim";
@@ -1863,7 +1857,7 @@ group {
 			target: "part_focus1";
 			target: "part_focus2";
 			target: "part_focus3";
-			target: "bg_text";
+			target: "defaultbg_text";
 			transition: TRANSITION_FOCUS;
 			after: "focus,in,anim,2";
 		}
@@ -1879,7 +1873,6 @@ group {
 					set_state(PART:PART_RECENT_CONTENT_FAVORITE,
 							"default,selected", 0.0);
 				}
-				set_state(PART:"defaultbg_text", "selected", 0.0);
 			}
 		}
 		program {
@@ -1904,7 +1897,6 @@ group {
 			action: STATE_SET "default" 0.0;
 			target: PART_RECENT_CONTENT_TITLE;
 			target: PART_RECENT_CONTENT_DATE;
-			target: "defaultbg_text";
 			after: "focus,out,anim";
 		}
 		program {
@@ -1913,7 +1905,7 @@ group {
 			target: "part_focus1";
 			target: "part_focus2";
 			target: "part_focus3";
-			target: "bg_text";
+			target: "defaultbg_text";
 			transition: TRANSITION_FOCUS;
 			after: "focus,out,anim,2";
 		}
@@ -1928,7 +1920,7 @@ group {
 			target: "part_focus1";
 			target: "part_focus2";
 			target: "part_focus3";
-			target: "bg_text";
+			target: "defaultbg_text";
 		}
 		program {
 			name: "button_clicked";
diff --git a/res/edc/widgets/gengrid.edc b/res/edc/widgets/gengrid.edc
index 31e5db4..403168d 100644
--- a/res/edc/widgets/gengrid.edc
+++ b/res/edc/widgets/gengrid.edc
@@ -18,7 +18,7 @@ group {
 	name: "elm/gengrid/item/movie_item/default";
 	data.item: "selectraise" "on";
 	data.item: "texts" "elm.text.title";
-	data.item: "contents" "elm.swallow.thumbnail elm.swallow.favorite";
+	data.item: "contents" "elm.swallow.thumbnail elm.swallow.favorite elm.swallow.textbg";
 	data.item: "focus_highlight" "on";
 	images {
 		image: IMAGE_PREVIEW_PLAY COMP;
@@ -76,7 +76,7 @@ group {
 				state: "default" 0.0;
 				rel1.to: "bg";
 				rel2 {
-					to: "elm.bg.text";
+					to: PART_ELM_SWALLOW_TEXTBG;
 					relative: 1.0 0.0;
 				}
 				color: 0 0 0 115;
@@ -232,7 +232,7 @@ group {
 					relative: 0.0 1.0;
 				}
 				rel2 {
-					to: "elm.bg.text";
+					to: PART_ELM_SWALLOW_TEXTBG;
 					relative: 0.0 0.0;
 				}
 				min: 6 0;
@@ -270,7 +270,7 @@ group {
 					relative: 1.0 1.0;
 				}
 				rel2 {
-					to: "elm.bg.text";
+					to: PART_ELM_SWALLOW_TEXTBG;
 					relative: 1.0 0.0;
 				}
 				min: 6 0;
@@ -297,9 +297,8 @@ group {
 			}
 		}
 		part {
-			name: "defaultbg_text";
-			type: RECT;
-			mouse_events: 0;
+			name: PART_ELM_SWALLOW_TEXTBG;
+			type: SWALLOW;
 			scale: 1;
 			description {
 				state: "default" 0.0;
@@ -310,29 +309,23 @@ group {
 				rel2.to: "bg";
 				min: 0 82;
 				align: 0.5 1.0;
-				color: COLOR_TEXT_BG;
 				fixed: 0 1;
 				map {
 					perspective_on: 1;
 					perspective: "map";
 				}
 			}
-			description {
-				state: "selected" 0.0;
-				inherit: "default" 0.0;
-				color: COLOR_ITEM_FOCUS;
-				map.on: 1;
-			}
 		}
 		part {
-			name: "elm.bg.text";
+			name: "defaultbg_text";
 			type: RECT;
+			mouse_events: 0;
 			scale: 1;
 			description {
 				state: "default" 0.0;
-				rel1.to: "defaultbg_text";
-				rel2.to: "defaultbg_text";
-				color: COLOR_TEXT_BG;
+				rel1.to: PART_ELM_SWALLOW_TEXTBG;
+				rel2.to: PART_ELM_SWALLOW_TEXTBG;
+				visible: 0;
 				map {
 					perspective_on: 1;
 					perspective: "map";
@@ -341,6 +334,7 @@ group {
 			description {
 				state: "selected" 0.0;
 				inherit: "default" 0.0;
+				visible: 1;
 				color: COLOR_ITEM_FOCUS;
 				map.on: 1;
 			}
@@ -356,9 +350,9 @@ group {
 			scale: 1;
 			description {
 				state: "default" 0.0;
-				rel1.to: "elm.bg.text";
+				rel1.to: PART_ELM_SWALLOW_TEXTBG;
 				rel2 {
-					to: "elm.bg.text";
+					to: PART_ELM_SWALLOW_TEXTBG;
 					relative: 0.0 0.0;
 				}
 				min: 18 82;
@@ -373,11 +367,11 @@ group {
 			description {
 				state: "default" 0.0;
 				rel1 {
-					to: "elm.bg.text";
+					to: PART_ELM_SWALLOW_TEXTBG;
 					relative: 1.0 0.0;
 				}
 				rel2 {
-					to: "elm.bg.text";
+					to: PART_ELM_SWALLOW_TEXTBG;
 					relative: 1.0 0.0;
 				}
 				min: 18 82;
@@ -431,7 +425,7 @@ group {
 			target: "part_focus1";
 			target: "part_focus2";
 			target: "part_focus3";
-			target: "elm.bg.text";
+			target: "defaultbg_text";
 			target: PART_ELM_TEXT_TITLE;
 			after: "focus,in,anim";
 		}
@@ -445,14 +439,8 @@ group {
 			target: "part_focus1";
 			target: "part_focus2";
 			target: "part_focus3";
-			target: "elm.bg.text";
-			transition: TRANSITION_FOCUS;
-			after: "focus,in,anim,2";
-		}
-		program {
-			name: "focus,in,anim,2";
-			action: STATE_SET "selected" 0.0;
 			target: "defaultbg_text";
+			transition: TRANSITION_FOCUS;
 		}
 		program {
 			name: "go_passive";
@@ -460,7 +448,6 @@ group {
 			source: "elm";
 			action: STATE_SET "default" 0.0;
 			target: PART_ELM_TEXT_TITLE;
-			target: "defaultbg_text";
 			after: "focus,out,anim";
 		}
 		program {
@@ -469,7 +456,7 @@ group {
 			target: "part_focus1";
 			target: "part_focus2";
 			target: "part_focus3";
-			target: "elm.bg.text";
+			target: "defaultbg_text";
 			transition: TRANSITION_FOCUS;
 			after: "focus,out,anim,2";
 		}
@@ -483,7 +470,7 @@ group {
 			target: "part_focus1";
 			target: "part_focus2";
 			target: "part_focus3";
-			target: "elm.bg.text";
+			target: "defaultbg_text";
 		}
 	}
 }