Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

fix text edit losing focus

shun-iwasawadfd2f7a567f8
diff --git a/toonz/sources/include/toonzqt/paramfield.h b/toonz/sources/include/toonzqt/paramfield.h
index 07acfa0e3..9ecde50f8 100644
--- a/toonz/sources/include/toonzqt/paramfield.h
+++ b/toonz/sources/include/toonzqt/paramfield.h
@@ -618,7 +618,6 @@ public:
protected:
void keyPressEvent(QKeyEvent *event) override;
void focusOutEvent(QFocusEvent *e) override;
- bool eventFilter(QObject *, QEvent *) override;
signals:
void edited();
diff --git a/toonz/sources/toonz/pane.cpp b/toonz/sources/toonz/pane.cpp
index 2f2662fcc..43e8f5b7d 100644
--- a/toonz/sources/toonz/pane.cpp
+++ b/toonz/sources/toonz/pane.cpp
@@ -34,6 +34,7 @@
#include <QDesktopWidget>
#include <QDialog>
#include <QLineEdit>
+#include <QTextEdit>
#include <QScreen>
extern TEnv::StringVar EnvSafeAreaName;
@@ -123,7 +124,8 @@ void TPanel::enterEvent(QEvent *event) {
if (w) {
// grab the focus, unless a line-edit is focused currently
QWidget *focusWidget = qApp->focusWidget();
- if (focusWidget && dynamic_cast<QLineEdit *>(focusWidget)) {
+ if (focusWidget && (dynamic_cast<QLineEdit *>(focusWidget) ||
+ dynamic_cast<QTextEdit *>(focusWidget))) {
event->accept();
return;
}
diff --git a/toonz/sources/toonzqt/paramfield.cpp b/toonz/sources/toonzqt/paramfield.cpp
index 292e9b91a..d8ae05fd7 100644
--- a/toonz/sources/toonzqt/paramfield.cpp
+++ b/toonz/sources/toonzqt/paramfield.cpp
@@ -1565,9 +1565,7 @@ void IntParamField::update(int frame) {
namespace component {
MyTextEdit::MyTextEdit(const QString &text, QWidget *parent)
- : QTextEdit(text, parent) {
- installEventFilter(this);
-}
+ : QTextEdit(text, parent) {}
void MyTextEdit::keyPressEvent(QKeyEvent *event) {
QTextEdit::keyPressEvent(event);
@@ -1579,25 +1577,6 @@ void MyTextEdit::focusOutEvent(QFocusEvent *event) {
emit edited();
}
-bool MyTextEdit::eventFilter(QObject *obj, QEvent *e) {
- if (e->type() != QEvent::ShortcutOverride)
- return QTextEdit::eventFilter(obj, e);
-
- QKeyEvent *ke = (QKeyEvent *)e;
- std::string keyStr =
- QKeySequence(ke->key() + ke->modifiers()).toString().toStdString();
- QAction *action = CommandManager::instance()->getActionFromShortcut(keyStr);
- if (!action) return QTextEdit::eventFilter(obj, e);
-
- std::string actionId = CommandManager::instance()->getIdFromAction(action);
- if (actionId == "MI_Undo" || actionId == "MI_Redo" ||
- actionId == "MI_Clear" || actionId == "MI_Copy" ||
- actionId == "MI_Paste" || actionId == "MI_Cut")
- return QTextEdit::eventFilter(obj, e);
-
- return true;
-}
-
}; // namespace component
StringParamField::StringParamField(QWidget *parent, QString name,