3 files changed, 11 insertions(+), 6 deletions(-)

M module-apps/application-calllog/windows/CallLogMainWindow.cpp
M module-apps/application-calllog/windows/CallLogMainWindow.hpp
M module-gui/gui/widgets/header/DeleteAction.cpp

@@ 5,7 5,6 @@
 #include "data/CallLogInternals.hpp"
 #include "ApplicationCallLog.hpp"
 #include "widgets/CalllogItem.hpp"
-#include "header/DeleteAction.hpp"
 
 #include <DialogMetadata.hpp>
 #include <DialogMetadataMessage.hpp>


@@ 44,14 43,14 @@ namespace gui
         list->rebuildList(gui::listview::RebuildType::InPlace);
     }
 
-    gui::header::DeleteAction *ptr;
     void CallLogMainWindow::buildInterface()
     {
         AppWindow::buildInterface();
 
         setTitle(utils::translate("app_calllog_title_main"));
 
-        header->navigationIndicatorAdd((ptr = new gui::header::DeleteAction()), gui::header::BoxSelection::Right);
+        header->navigationIndicatorAdd((deleteAction = new gui::header::DeleteAction()),
+                                       gui::header::BoxSelection::Right);
 
         navBar->setText(nav_bar::Side::Left, utils::translate(style::strings::common::call));
         navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::open));


@@ 189,7 188,7 @@ namespace gui
 
     void CallLogMainWindow::onEmptyList()
     {
-        header->removeWidget(ptr);
+        header->navigationIndicatorRemove(gui::header::BoxSelection::Right);
 
         navBar->setActive(gui::nav_bar::Side::Left, false);
         navBar->setActive(gui::nav_bar::Side::Center, false);


@@ 199,6 198,9 @@ namespace gui
 
     void CallLogMainWindow::onListFilled()
     {
+        header->navigationIndicatorAdd((deleteAction = new gui::header::DeleteAction()),
+                                       gui::header::BoxSelection::Right);
+
         navBar->setActive(gui::nav_bar::Side::Left, true);
         navBar->setActive(gui::nav_bar::Side::Center, true);
         emptyLayout->setVisible(false);

@@ 4,6 4,7 @@
 #pragma once
 
 #include "CalllogModel.hpp"
+#include "header/DeleteAction.hpp"
 
 #include <AppWindow.hpp>
 #include <ListView.hpp>


@@ 20,6 21,8 @@ namespace gui
         gui::VBox *emptyLayout = nullptr;
         bool isEmpty() const;
 
+        header::DeleteAction *deleteAction = nullptr;
+
       public:
         explicit CallLogMainWindow(app::ApplicationCommon *app);
 

@@ 15,9 15,9 @@ namespace gui::header
     {
         setAlignment(Alignment(Alignment::Horizontal::Right, Alignment::Vertical::Center));
         setEdges(RectangleEdge::None);
-        setMargins(Margins(style::header::navigation_indicator::right_left_margin,
+        setMargins(Margins(0,
                            style::header::navigation_indicator::top_margin,
-                           0,
+                           style::header::navigation_indicator::right_left_margin,
                            0));
 
         auto wasteBin        = new gui::Image("delete_24px_W_G");