Extract layer rename planning

src/app_core/document_layer.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#include "foundation/result.h"
+
+#include <cstddef>
+#include <string>
+#include <string_view>
+#include <utility>
+
+namespace pp::app {
+
+inline constexpr std::size_t document_layer_name_max_length = 128;
+
+enum class DocumentLayerRenameAction {
+    no_op_same_name,
+    rename_and_record_undo,
+};
+
+struct DocumentLayerRenamePlan {
+    std::string old_name;
+    std::string new_name;
+    DocumentLayerRenameAction action = DocumentLayerRenameAction::no_op_same_name;
+};
+
+[[nodiscard]] inline pp::foundation::Result<DocumentLayerRenamePlan> plan_document_layer_rename(
+    std::string_view old_name,
+    std::string_view requested_name)
+{
+    if (requested_name.empty()) {
+        return pp::foundation::Result<DocumentLayerRenamePlan>::failure(
+            pp::foundation::Status::invalid_argument("layer name must not be empty"));
+    }
+
+    if (requested_name.size() > document_layer_name_max_length) {
+        return pp::foundation::Result<DocumentLayerRenamePlan>::failure(
+            pp::foundation::Status::out_of_range("layer name length exceeds the configured limit"));
+    }
+
+    DocumentLayerRenamePlan plan;
+    plan.old_name = std::string(old_name);
+    plan.new_name = std::string(requested_name);
+    plan.action = old_name == requested_name
+        ? DocumentLayerRenameAction::no_op_same_name
+        : DocumentLayerRenameAction::rename_and_record_undo;
+    return pp::foundation::Result<DocumentLayerRenamePlan>::success(std::move(plan));
+}
+
+}

src/app_dialogs.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "app.h"
 #include "action.h"
+#include "app_core/document_layer.h"
 #include "app_core/document_resize.h"
 #include "app_core/document_export.h"
 #include "app_core/document_session.h"
@@ -605,6 +606,17 @@ void App::dialog_layer_rename()
 
     dialog->btn_ok->on_click = [this,dialog](Node*)
     {
+        const auto old_name = layers->m_current_layer->m_label_text;
+        const auto plan = pp::app::plan_document_layer_rename(old_name, dialog->get_name());
+        if (!plan)
+            return;
+        if (plan.value().action == pp::app::DocumentLayerRenameAction::no_op_same_name)
+        {
+            dialog->destroy();
+            App::I->hideKeyboard();
+            return;
+        }
+
         struct ActionLayerRename : public Action
         {
             std::string m_old_name;
@@ -628,9 +640,13 @@ void App::dialog_layer_rename()
         };
         auto layer_node = std::static_pointer_cast<NodeLayer>(layers->m_current_layer->shared_from_this());
         auto* layer = canvas->m_canvas->m_layers[canvas->m_canvas->m_current_layer_idx].get();
-        ActionManager::add(new ActionLayerRename(layers->m_current_layer->m_label_text, dialog->get_name(), layer_node, layer));
-        layer_node->set_name(dialog->get_name().c_str());
-        layer->m_name = dialog->get_name();
+        ActionManager::add(new ActionLayerRename(
+            plan.value().old_name,
+            plan.value().new_name,
+            layer_node,
+            layer));
+        layer_node->set_name(plan.value().new_name.c_str());
+        layer->m_name = plan.value().new_name;
         dialog->destroy();
         App::I->hideKeyboard();
     };