From 1cb535dcbb4b83389da48c3d6743a0891e5dae0b Mon Sep 17 00:00:00 2001
From: Iurie Nistor <iuriehn@gmail.com>
Date: Fri, 23 Feb 2024 12:47:46 +0200
Subject: [PATCH] remove path label

---
 src/file_dialog.cpp            | 24 ++----------------------
 src/file_dialog.h              |  3 ---
 src/redkite/src/RkLineEdit.cpp |  4 ++--
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/file_dialog.cpp b/src/file_dialog.cpp
index b4c92d2..361ce6f 100644
--- a/src/file_dialog.cpp
+++ b/src/file_dialog.cpp
@@ -385,7 +385,6 @@ FileDialog::FileDialog(GeonkickWidget *parent,
         : GeonkickWidget(parent, type == FileDialog::Type::Browse ? Rk::WindowFlags::Widget : Rk::WindowFlags::Popup)
         , dialogType{type}
         , filesView{nullptr}
-        , pathLabel{nullptr}
         , status{AcceptStatus::Cancel}
         , shortcutDirectoriesModel{new PathListModel(this)}
         , shortcutDirectoriesView{new RkList(this, shortcutDirectoriesModel)}
@@ -412,8 +411,6 @@ FileDialog::FileDialog(GeonkickWidget *parent,
         RK_ACT_BIND(filesView, openFile, RK_ACT_ARGS(const std::string &), this, onAccept());
         RK_ACT_BIND(filesView, currentFileChanged, RK_ACT_ARGS(const std::string &file),
                     this, currentFileChanged(file));
-        RK_ACT_BIND(filesView, currentPathChanged, RK_ACT_ARGS(const std::string &pathName),
-                    this, onPathChanged(pathName));
         RK_ACT_BIND(filesView, currentPathChanged, RK_ACT_ARGS(const std::string &pathName),
                     this, directoryChanged(pathName));
         RK_ACT_BIND(shortcutDirectoriesModel,
@@ -429,17 +426,6 @@ FileDialog::FileDialog(GeonkickWidget *parent,
         shortcutDirectoriesView->setSize(100 ,filesView->height());
         shortcutDirectoriesView->show();
 
-        // Create path label
-        pathLabel = new RkLabel(this, "Path: " + filesView->getCurrentPath());
-        pathLabel->setBackgroundColor(background());
-        pathLabel->setFixedSize(200, 20);
-        pathLabel->setPosition(filesView->x(), 15);
-        pathLabel->setFont(font());
-        pathLabel->setTextColor(textColor());
-        pathLabel->show();
-        topContainer->addSpace(shortcutDirectoriesView->width() + 5);
-        topContainer->addWidget(pathLabel);
-
         createBookmarkDirectoryControls(topContainer);
         createNewDirectoryControls(topContainer);
 
@@ -482,7 +468,7 @@ FileDialog::FileDialog(GeonkickWidget *parent,
 
 void FileDialog::createBookmarkDirectoryControls(RkContainer *container)
 {
-        container->addSpace(200);
+        container->addSpace(10);
         bookmarkDirectoryButton = new GeonkickButton(this);
         bookmarkDirectoryButton->setCheckable(true);
         bookmarkDirectoryButton->setSize(16, 16);
@@ -561,19 +547,13 @@ void FileDialog::createNewDirectoryControls(RkContainer *container)
                      editingFinished,
                      RK_ACT_ARGS(),
                      [=,this](){
-                             editDirectoryName->hide();
+                             editDirectoryName->close();
                              createDirectoryButton->show();
                              editDirectoryName->setText("");
                              container->update();
                      });
 }
 
-void FileDialog::onPathChanged(const std::string &pathName)
-{
-        if (!pathName.empty())
-                pathLabel->setText("Path: " + pathName);
-}
-
 void FileDialog::onAccept()
 {
         status = AcceptStatus::Accept;
diff --git a/src/file_dialog.h b/src/file_dialog.h
index fe3a5a8..6b4f564 100644
--- a/src/file_dialog.h
+++ b/src/file_dialog.h
@@ -31,7 +31,6 @@ class RkPaintEvent;
 class RkMouseEvent;
 class RkCloseEvent;
 class GeonkickButton;
-class RkLabel;
 class GeonkickSlider;
 class PathListModel;
 class RkList;
@@ -138,14 +137,12 @@ class FileDialog: public GeonkickWidget {
         void updateBookmarkButton(const std::filesystem::path &path);
         void onAccept();
         void onCancel();
-        void onPathChanged(const std::string &pathName);
         void closeEvent(RkCloseEvent *event) final;
 
  private:
         RkLineEdit *fileNameEdit;
         Type dialogType;
         FilesView *filesView;
-        RkLabel *pathLabel;
         std::string pathSelected;
         AcceptStatus status;
         PathListModel* shortcutDirectoriesModel;
diff --git a/src/redkite/src/RkLineEdit.cpp b/src/redkite/src/RkLineEdit.cpp
index c8041e0..f36d2cc 100644
--- a/src/redkite/src/RkLineEdit.cpp
+++ b/src/redkite/src/RkLineEdit.cpp
@@ -180,8 +180,8 @@ void RkLineEdit::focusEvent(RkFocusEvent* event)
 	} else if (event->type() == RkEvent::Type::FocusedOut) {
                 RK_LOG_DEBUG("RkEvent::Type::FocusedOut");
 		if (impl_ptr->hasEditFocus())
-			action editingFinished();
-		hideCursor();
+                        action editingFinished();
+                hideCursor();
 	}
 }