From 12eac75f6fecbb7e0f5c8a9befb7ee85ecfeaa22 Mon Sep 17 00:00:00 2001
From: Radek Kintop <r.kintop@samsung.com>
Date: Tue, 2 May 2017 17:42:01 +0200
Subject: [PATCH] Menu button style updated and ap bg set

Change-Id: I762f05765bebd594d3f5f26f572e0623045671b2
Signed-off-by: Radek Kintop <r.kintop@samsung.com>
---
 res/images/4.0/bg_dimmed_bk_95.#.png | Bin 0 -> 81 bytes
 res/view/base.edc                    |  12 +++++++---
 res/widget/button.edc                |  45 +++++++++--------------------------
 3 files changed, 20 insertions(+), 37 deletions(-)
 create mode 100644 res/images/4.0/bg_dimmed_bk_95.#.png

diff --git a/res/images/4.0/bg_dimmed_bk_95.#.png b/res/images/4.0/bg_dimmed_bk_95.#.png
new file mode 100644
index 0000000000000000000000000000000000000000..c817f5995bdaf62a1b940f092429be6d23034f82
GIT binary patch
literal 81
zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=Bs^UlLn>}1Cp0wt58!!T)AZ<n
e1Z%(+28KFg?t>qb*kyof7(8A5T-G@yGywnwUKU^g

literal 0
HcmV?d00001

diff --git a/res/view/base.edc b/res/view/base.edc
index da08944..ba04ddd 100644
--- a/res/view/base.edc
+++ b/res/view/base.edc
@@ -26,19 +26,25 @@
 #define MENU_Y1 (TITLE_Y2 + 20.0 / BASE_RESOLUTION_Y)
 #define MENU_Y2 (MENU_Y1 + 74.0 / BASE_RESOLUTION_Y)
 
-
 group {
+
+	images {
+		image: "4.0/bg_dimmed_bk_95.#.png" RAW;
+	}
+
 	name: GRP_VIEW_BASE;
 	parts {
 		part {
 			name: "bg";
-			type: RECT;
+			type: IMAGE;
 			scale: 0;
 			description {
 				state: "default" 0.0;
 				rel1.relative: 0.0510 0.0667;
 				rel2.relative: 0.9490 0.9111;
-				color: 150 150 150 230;
+				image {
+					normal: "4.0/bg_dimmed_bk_95.#.png";
+				}
 			}
 		}
 		part {
diff --git a/res/widget/button.edc b/res/widget/button.edc
index f31036c..26479b6 100644
--- a/res/widget/button.edc
+++ b/res/widget/button.edc
@@ -128,7 +128,7 @@ group {
 			scale: 0;
 			description {
 				state, "default" 0.0;
-				color, 104 104 104 64;
+				color, 255 255 255 20;
 				rel1 {
 					to, "padding.text.left";
 					relative, 1.0 0.0;
@@ -139,7 +139,7 @@ group {
 				}
 				text {
 					min, 1 1;
-					font, FONT_REGULAR;
+					font, "BreezeSans:weight=medium";
 					size, 32;
 					align, 0.5 0.5;
 					ellipsis, -1;
@@ -148,7 +148,7 @@ group {
 			description {
 				state, "selected" 0.0;
 				inherit, "default" 0.0;
-				color, 64 136 211 255;
+				color, 255 255 255 179;
 			}
 			description {
 				state, "focused" 0.0;
@@ -157,45 +157,17 @@ group {
 			}
 		}
 
-		part {
-			name, "part.bottom.line";
-			type, RECT;
-			scale: 0;
-			description {
-				state, "default" 0.0;
-				min, 0 3;
-				rel1 {
-					to, "part.bg";
-					relative, 0.0 1.0;
-				}
-				rel2 {
-					to, "part.bg";
-				}
-				align, 0.5 1.0;
-				fixed, 0 1;
-				color, 64 136 211 0;
-			}
-			description {
-				state, "selected" 0.0;
-				inherit, "default" 0.0;
-				color, 64 136 211 255;
-			}
-			description {
-				state, "focused" 0.0;
-				inherit, "default" 0.0;
-			}
-		}
 	}
 		program {
 			name, "selected,set";
 			action, STATE_SET "selected" 0.0;
-			target, "part.bottom.line";
+			target, "elm.text";
 			transition, TRANSITION_FOCUS;
 		}
 		program {
 			name, "unselected,set";
 			action, STATE_SET "default" 0.0;
-			target, "part.bottom.line";
+			target, "elm.text";
 			transition, TRANSITION_FOCUS;
 		}
 		program {
@@ -247,8 +219,13 @@ group {
 					new state;
 					state = get_int(selected);
 					if (state)
+					{
 						run_program(PROGRAM:"selected,set");
-					run_program(PROGRAM:"unfocused,anim");
+					}
+					else
+					{
+						run_program(PROGRAM:"unfocused,anim");
+					}
 					set_int(focused, false);
 				}
 			}
-- 
2.7.4