TizenRefApp-7857 Wrong play icon size after rotation

Change-Id: I9505f56a559cf18d93c818caa53f850eab98dcc3
Signed-off-by: Nataliia Sydorchuk <n.sydorchuk@samsung.com>

diff --git a/memo-app/res/input/edje/InputLayout.h b/memo-app/res/input/edje/InputLayout.h
index 439afd3c080ac0885d9e7de8edc69e9ece1641c9..2d7ff6b6dbd612861476e522fd36d612fabb1ca2 100644 (file)
--- a/memo-app/res/input/edje/InputLayout.h
+++ b/memo-app/res/input/edje/InputLayout.h
@@ -34,6 +34,9 @@
 #define SIGNAL_DATETIME_SHOW    "datetime,state,show"
 #define SIGNAL_DATETIME_HIDE    "datetime,state,hide"
 
+#define SIGNAL_RECORD_PORTRAIT  "record,state,portrait"
+#define SIGNAL_RECORD_LANDSCAPE "record,state,landscape"
+
 #define SIGNAL_IMAGE_PORTRAIT   "image,state,portrait"
 #define SIGNAL_IMAGE_LANDSCAPE  "image,state,landscape"
 #define SIGNAL_IMAGE_DIMMED     "image,state,dimmed"

diff --git a/memo-app/res/input/edje/input-layout.edc b/memo-app/res/input/edje/input-layout.edc
index 3d7c6254c5ec3a1f1aebbe78ef6feb5b3fe1692f..651e111cd1016fe5d2d60e6f2f5ee749f72478d8 100644 (file)
--- a/memo-app/res/input/edje/input-layout.edc
+++ b/memo-app/res/input/edje/input-layout.edc
@@ -29,6 +29,9 @@
 
 #define IMAGE_TB       32
 
+#define RECORD_FIELD_H_P 120
+#define RECORD_FIELD_H_L 80
+
 styles {
        style {
                name: "datetime_text";
@@ -134,9 +137,14 @@ collections {
                        }
                        swallow { PART_RECORD;
                                desc { "default";
+                                       min: 0 RECORD_FIELD_H_P;
                                        align: 0.5 1.0;
                                        rel1.relative: 0.0 1.0;
                                }
+                               desc { "landscape";
+                                       inherit: "default";
+                                       min: 0 RECORD_FIELD_H_L;
+                               }
                        }
                }
                programs {
@@ -154,6 +162,16 @@ collections {
                                target: PART_DATETIME;
                                target: "spacer.datetime.bottom";
                        }
+                       program {
+                               signal: SIGNAL_RECORD_PORTRAIT;
+                               action: STATE_SET "default";
+                               target: PART_RECORD;
+                       }
+                       program {
+                               signal: SIGNAL_RECORD_LANDSCAPE;
+                               action: STATE_SET "landscape";
+                               target: PART_RECORD;
+                       }
                }
        }
 

diff --git a/memo-app/res/input/edje/record-field-layout.edc b/memo-app/res/input/edje/record-field-layout.edc
index 54d8a22f4bdfefd391301ef12b559af1dbf9622e..1f4bacb546045735444051ea4a21d56487e8a3e1 100644 (file)
--- a/memo-app/res/input/edje/record-field-layout.edc
+++ b/memo-app/res/input/edje/record-field-layout.edc
@@ -16,9 +16,6 @@
 
 #include "RecordFieldLayout.h"
 
-#define RECORD_FIELD_H_P 120
-#define RECORD_FIELD_H_L 80
-
 #define RECORD_FIELD_L 38
 #define RECORD_FIELD_R 30
 #define BTN_REC_PLAY_L 34
@@ -71,13 +68,8 @@ collections {
                parts {
                        rect { "bg"; scale;
                                desc { "default";
-                                       min: 0 RECORD_FIELD_H_P;
                                        color: 250 250 250 235;
                                }
-                               desc { "landscape";
-                                       inherit: "default";
-                                       min: 0 RECORD_FIELD_H_L;
-                               }
                        }
                        spacer { "spacer.left"; scale;
                                desc { "default";
@@ -205,7 +197,6 @@ collections {
                                desc { "default";
                                        rel1 { relative: 1.0 0.0; to_x: "spacer.slider.left"; to_y: "spacer.slider.bottom"; }
                                        rel2 { relative: 0.0 0.0; to_x: "spacer.slider.right"; to_y: "spacer.slider.bottom"; }
-                                       fixed: 0 1;
                                        visible: 0;
                                }
                                desc { "visible";
@@ -293,7 +284,6 @@ collections {
                                source: "*";
                                script {
                                        set_int(is_landscape, 0);
-                                       set_state(PART:"bg", "default", 0.0);
                                        set_state(PART:PART_BTN_REC_PLAY, "default", 0.0);
                                        set_state(PART:"spacer.slider.left", "default", 0.0);
                                        set_state(PART:"spacer.slider.bottom", "default", 0.0);
@@ -308,7 +298,6 @@ collections {
                                source: "*";
                                script {
                                        set_int(is_landscape, 1);
-                                       set_state(PART:"bg", "landscape", 0.0);
                                        set_state(PART:PART_BTN_REC_PLAY, "landscape", 0.0);
                                        set_state(PART:"spacer.slider.left", "landscape", 0.0);
                                        set_state(PART:"spacer.slider.bottom", "landscape", 0.0);

diff --git a/memo-app/src/Input/InputView.cpp b/memo-app/src/Input/InputView.cpp
index 266d4e97021e0fd9536fc8dff8b57613206562a0..abea1f5e7c033f2599a6a35e623713a9f539c5ff 100644 (file)
--- a/memo-app/src/Input/InputView.cpp
+++ b/memo-app/src/Input/InputView.cpp
@@ -148,6 +148,11 @@ void InputView::onNavigation(bool isCurrent)
 void InputView::onRotationChanged(int degree)
 {
        if (m_RecordField) {
+               if (degree == 0 || degree == 180) {
+                       elm_object_signal_emit(getEvasObject(), SIGNAL_RECORD_PORTRAIT, "");
+               } else if (degree == 90 || degree == 270) {
+                       elm_object_signal_emit(getEvasObject(), SIGNAL_RECORD_LANDSCAPE, "");
+               }
                m_RecordField->setRotation(degree);
        }
 }
@@ -245,9 +250,9 @@ Evas_Object *InputView::createRecordField(Evas_Object *parent, RecordField::Mode
 {
        m_RecordField = new RecordField(m_Memo.getSoundRecord()->getPath(), mode);
        m_RecordField->create(parent);
-       m_RecordField->setRotation(getRotation());
        m_RecordField->setRecordingStartCallback(std::bind(&InputView::onMemoChanged, this));
        m_RecordField->setDeleteCallback(std::bind(&InputView::onRecordFieldDelete, this));
+       onRotationChanged(getRotation());
 
        return m_RecordField->getEvasObject();
 }