Fix open animation starting from the wrong position.

Change-Id: I7647e1c547b52b2a3b9db34f347228ee15ba4eca
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

3 files changed, 12 insertions, 17 deletions

diff --git a/voice-app/res/voice/edje/VoiceLayout.h b/voice-app/res/voice/edje/VoiceLayout.h
index 289793e..ab57ad2 100644
--- a/voice-app/res/voice/edje/VoiceLayout.h
+++ b/voice-app/res/voice/edje/VoiceLayout.h
@@ -33,9 +33,7 @@
 #define SIGNAL_FEEDBACK_HIDE    "state,feedback,hidden"
 #define SIGNAL_CLOSE            "state,closed"
 
-#define SIGNAL_FLOATING         "state,floating"
-#define SIGNAL_FULL_SCREEN      "state,full_screen"
-
+#define SIGNAL_BUTTON_FLOATING  "state,button,floating"
 #define SIGNAL_BUTTON_ENABLE    "state,button,enabled"
 #define SIGNAL_BUTTON_DISABLE   "state,button,disabled"
 #define SIGNAL_BUTTON_PRESSED   "action,button,pressed"
diff --git a/voice-app/res/voice/edje/voice-view-layout.edc b/voice-app/res/voice/edje/voice-view-layout.edc
index a02bcc2..1972e10 100644
--- a/voice-app/res/voice/edje/voice-view-layout.edc
+++ b/voice-app/res/voice/edje/voice-view-layout.edc
@@ -529,6 +529,7 @@ collections {
 					run_program(PROGRAM:"reset_text");
 					if (get_int(is_minimized)) {
 						if (!get_int(is_animating)) {
+							set_state(PART:"image.bg", "small", 0.0);
 							run_program(PROGRAM:"maximize_bg");
 							run_program(PROGRAM:"maximize_feedback_effect");
 							run_program(PROGRAM:"maximize_text");
@@ -574,18 +575,6 @@ collections {
 				}
 			}
 			program {
-				signal: SIGNAL_FLOATING;
-				source: "*";
-				action: STATE_SET "floating";
-				target: "image.bg";
-			}
-			program {
-				signal: SIGNAL_FULL_SCREEN;
-				source: "*";
-				action: STATE_SET "small";
-				target: "image.bg";
-			}
-			program {
 				signal: SIGNAL_BG_ENABLE;
 				source: "*";
 				script {
@@ -600,6 +589,15 @@ collections {
 				}
 			}
 			program {
+				signal: SIGNAL_BUTTON_FLOATING;
+				source: "*";
+				script {
+					if (get_int(is_minimized)) {
+						set_state(PART:"image.bg", "floating", 0.0);
+					}
+				}
+			}
+			program {
 				signal: SIGNAL_BUTTON_ENABLE;
 				source: "*";
 				script {
diff --git a/voice-app/src/Voice/FloatingView.cpp b/voice-app/src/Voice/FloatingView.cpp
index 78c0671..5d2b667 100644
--- a/voice-app/src/Voice/FloatingView.cpp
+++ b/voice-app/src/Voice/FloatingView.cpp
@@ -120,14 +120,13 @@ void FloatingView::shrinkWindow()
 	int x = 0, y = 0, w = 0, h = 0;
 	evas_object_geometry_get(button, &x, &y, &w, &h);
 	evas_object_geometry_set(getWindow(), x, y, w, h);
-	elm_layout_signal_emit(getEvasObject(), SIGNAL_FLOATING, "");
+	elm_layout_signal_emit(getEvasObject(), SIGNAL_BUTTON_FLOATING, "");
 	elm_layout_signal_emit(getEvasObject(), SIGNAL_BG_DISABLE, "");
 }
 
 void FloatingView::expandWindow()
 {
 	evas_object_geometry_set(getWindow(), 0, 0, Ui::getScaledValue(SCREEN_WH), Ui::getScaledValue(SCREEN_WH));
-	elm_layout_signal_emit(getEvasObject(), SIGNAL_FULL_SCREEN, "");
 	elm_layout_signal_emit(getEvasObject(), SIGNAL_BG_ENABLE, "");
 }