fix: redasm-dev/bugs#8

Author: Dax89

CMakeLists.txt

@@ -43,6 +43,7 @@ target_sources(${PROJECT_NAME}
         src/dialogs/devgraphs.cpp
         src/dialogs/flc.cpp
         src/dialogs/goto.cpp
+        src/dialogs/input.cpp
         src/dialogs/loader.cpp
         src/dialogs/memorymap.cpp
         src/dialogs/patch.cpp

src/dialogs/input.cpp

@@ -0,0 +1,38 @@
+#include "input.h"
+#include <QKeyEvent>
+
+TextEditInputDialog::TextEditInputDialog(QWidget* parent, Qt::WindowFlags flags)
+    : QInputDialog{parent, flags} {
+    this->setOptions(QInputDialog::UsePlainTextEditForTextInput);
+}
+
+void TextEditInputDialog::keyPressEvent(QKeyEvent* event) {
+    if(event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) {
+        if(event->modifiers() & Qt::ControlModifier) {
+            this->accept();
+            event->accept();
+            return;
+        }
+    }
+
+    QInputDialog::keyPressEvent(event);
+}
+
+namespace input_dialog {
+
+QString get_multi_line_text(QWidget* parent, const QString& title,
+                            const QString& label, const QString& text, bool* ok,
+                            Qt::WindowFlags flags,
+                            Qt::InputMethodHints ime_hints) {
+    TextEditInputDialog dlg{parent, flags};
+    dlg.setWindowTitle(title);
+    dlg.setLabelText(label);
+    dlg.setTextValue(text);
+    dlg.setInputMethodHints(ime_hints);
+
+    int ret = dlg.exec();
+    if(ok) *ok = !!ret;
+    return ret ? dlg.textValue() : QString{};
+}
+
+} // namespace input_dialog

src/dialogs/input.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <QInputDialog>
+
+class TextEditInputDialog: public QInputDialog {
+    Q_OBJECT
+
+public:
+    explicit TextEditInputDialog(QWidget* parent = nullptr,
+                                 Qt::WindowFlags flags = {});
+
+protected:
+    void keyPressEvent(QKeyEvent* event) override;
+};
+
+namespace input_dialog {
+
+QString get_multi_line_text(QWidget* parent, const QString& title,
+                            const QString& label, const QString& text = {},
+                            bool* ok = nullptr, Qt::WindowFlags flags = {},
+                            Qt::InputMethodHints ime_hints = {});
+
+}

src/support/actions.cpp

@@ -2,6 +2,7 @@
 #include "dialogs/about.h"
 #include "dialogs/detail.h"
 #include "dialogs/goto.h"
+#include "dialogs/input.h"
 #include "dialogs/patch.h"
 #include "dialogs/settings.h"
 #include "dialogs/table.h"
@@ -286,9 +287,10 @@ void comment() {
     bool ok = false;
     const char* cmt = rd_get_comment(cv->context(), *address);
 
-    QString s = QInputDialog::getMultiLineText(
+    QString s = input_dialog::get_multi_line_text(
         g_mainwindow, QString{"Comment @ %1"}.arg(utils::to_hex(*address)),
-        "Insert comment (or leave empty):", cmt ? cmt : QString{}, &ok);
+        "Insert comment (or leave empty), CTRL+ENTER to accept:",
+        cmt ? cmt : QString{}, &ok);
 
     if(ok && rd_set_comment(cv->context(), *address, qUtf8Printable(s)))
         cv->surface()->invalidate();