From 183b2cb903150d3ed20f56a32d05cd08c6ef9f7d Mon Sep 17 00:00:00 2001
From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com>
Date: Tue, 10 Feb 2026 20:21:03 +0100
Subject: [PATCH] Focus name edit for new items

---
 lib/utils/item-selection-helpers.cpp | 11 ++++++++++-
 lib/utils/item-selection-helpers.hpp |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/utils/item-selection-helpers.cpp b/lib/utils/item-selection-helpers.cpp
index 31da05b1..6bbb0177 100644
--- a/lib/utils/item-selection-helpers.cpp
+++ b/lib/utils/item-selection-helpers.cpp
@@ -4,9 +4,11 @@
 #include "ui-helpers.hpp"
 
 #include <algorithm>
+
 #include <QAction>
-#include <QMenu>
 #include <QLayout>
+#include <QMenu>
+#include <QTimer>
 
 Q_DECLARE_METATYPE(advss::Item *);
 
@@ -330,6 +332,13 @@ void ItemSettingsDialog::NameChanged(const QString &text)
 	SetNameWarning("");
 }
 
+void ItemSettingsDialog::showEvent(QShowEvent *)
+{
+	if (_showNameEmptyWarning && _name->text().isEmpty()) {
+		_name->setFocus(Qt::OtherFocusReason);
+	}
+}
+
 void ItemSettingsDialog::SetNameWarning(const QString warn)
 {
 	if (warn.isEmpty()) {
diff --git a/lib/utils/item-selection-helpers.hpp b/lib/utils/item-selection-helpers.hpp
index a14f37c5..588fe200 100644
--- a/lib/utils/item-selection-helpers.hpp
+++ b/lib/utils/item-selection-helpers.hpp
@@ -52,6 +52,7 @@ private slots:
 	void NameChanged(const QString &);
 
 protected:
+	virtual void showEvent(QShowEvent *) override;
 	void SetNameWarning(const QString);
 
 	QLineEdit *_name;