3 files changed, 19 insertions(+), 19 deletions(-)

M module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp
M module-apps/application-desktop/windows/MmiPushWindow.cpp
M module-apps/application-desktop/windows/MmiPushWindow.hpp

@@ 21,8 21,8 @@ void MmiInternalMsgWindow::onBeforeShow(ShowMode mode, SwitchData *data)
             mmi::MMIMessageVisitor customMMIvisitor;
             std::string displayMessage;
             metadata->getCustomData()->accept(customMMIvisitor, displayMessage);
-            text->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Top));
-            text->setText(displayMessage);
+            icon->text->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Top));
+            icon->text->setText(displayMessage);
         }
         else {
             handleInternalMessages(metadata);


@@ 32,18 32,19 @@ void MmiInternalMsgWindow::onBeforeShow(ShowMode mode, SwitchData *data)
 
 void MmiInternalMsgWindow::handleInternalMessages(mmiactions::MMIResultParams *metadata)
 {
+    icon->text->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Top));
+
     std::string displayMessage;
-    text->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Top));
     auto result = metadata->getData();
     switch (result) {
     case mmiactions::MMIResultParams::MMIResult::Success:
-        text->setText(displayMessage + utils::translate("app_desktop_info_mmi_result_success"));
+        icon->text->setText(displayMessage + utils::translate("app_desktop_info_mmi_result_success"));
         break;
     case mmiactions::MMIResultParams::MMIResult::Failed:
-        text->setText(displayMessage + utils::translate("app_desktop_info_mmi_result_failed"));
+        icon->text->setText(displayMessage + utils::translate("app_desktop_info_mmi_result_failed"));
         break;
     default:
-        text->clear();
+        icon->text->clear();
         break;
     }
 }

@@ 33,22 33,22 @@ MmiPushWindow::MmiPushWindow(app::ApplicationCommon *app, const std::string &nam
 {
     AppWindow::buildInterface();
     bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::ok));
-    icon = new Image(this, style::desktop::image::x, style::desktop::image::y, "");
-    icon->set("info_big_circle_W_G");
-    text = new Text(
-        this, style::desktop::text::x, style::desktop::text::y, style::desktop::text::w, style::desktop::text::h);
-    text->setTextType(TextType::MultiLine);
-    text->setEditMode(EditMode::Browse);
-    text->setEdges(RectangleEdge::None);
-    text->setFont(style::window::font::medium);
-    text->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Top));
+    icon = new Icon(this,
+                    style::window::default_left_margin,
+                    style::window::default_vertical_pos,
+                    style::window::default_body_width,
+                    style::window::default_body_height,
+                    "info_big_circle_W_G",
+                    "");
+    icon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top));
+    icon->image->setMargins(Margins(0, icon::image_top_margin, 0, icon::image_bottom_margin));
     setTitle(utils::translate("app_desktop_info"));
 }
 
 void MmiPushWindow::onBeforeShow(ShowMode mode, SwitchData *data)
 {
     if (auto metadata = dynamic_cast<app::manager::actions::MMIParams *>(data); metadata != nullptr) {
-        text->setText(mmi::removePhrase(metadata->getData(), "\r"));
+        icon->text->setText(mmi::removePhrase(metadata->getData(), "\r"));
     }
 }
 

@@ 6,17 6,16 @@
 #include <AppWindow.hpp>
 #include <DialogMetadata.hpp>
 #include <Text.hpp>
+#include <Icon.hpp>
 
 #include <functional>
 
 namespace gui
 {
-    class Image;
     class MmiPushWindow : public AppWindow
     {
       protected:
-        Text *text  = nullptr;
-        Image *icon = nullptr;
+        Icon *icon = nullptr;
 
       public:
         MmiPushWindow(app::ApplicationCommon *app, const std::string &name);