Fix Riey#609 (Riey#610)

kpqi5858 · web-flow · commit 695c1488c915 · 2022-12-19T16:17:50.000+09:00
* Fix Riey#609 * Update CHANGELOG.md
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 * Update configuration.md
 * Correct scan code to properly recognize F11 and F12 key
+* Fix KDE plasmashell crash #609
 
 ## 3.0.1
 
diff --git a/src/frontends/qt5/src/input_context.cc b/src/frontends/qt5/src/input_context.cc
@@ -1,7 +1,7 @@
 #include "input_context.hpp"
 
 #include <QMetaEnum>
-#include <QtCore/QCoreApplication>
+#include <QtGui/QGuiApplication>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QTextCharFormat>
 
@@ -90,6 +90,7 @@ bool KimeInputContext::filterEvent(const QEvent *event) {
 }
 
 void KimeInputContext::preedit_str(kime::RustStr s) {
+  this->focus_object = qApp->focusObject();
   if (!this->focus_object) {
     return;
   }
@@ -105,6 +106,7 @@ void KimeInputContext::preedit_str(kime::RustStr s) {
 }
 
 void KimeInputContext::commit_str(kime::RustStr s) {
+  this->focus_object = qApp->focusObject();
   if (!this->focus_object) {
     return;
   }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#include "input_context.hpp"`
`2`	`2`
`3`	`3`	`#include <QMetaEnum>`
`4`		`-#include <QtCore/QCoreApplication>`
	`4`	`+#include <QtGui/QGuiApplication>`
`5`	`5`	`#include <QtGui/QKeyEvent>`
`6`	`6`	`#include <QtGui/QTextCharFormat>`
`7`	`7`
`@@ -90,6 +90,7 @@ bool KimeInputContext::filterEvent(const QEvent *event) {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`void KimeInputContext::preedit_str(kime::RustStr s) {`
	`93`	`+ this->focus_object = qApp->focusObject();`
`93`	`94`	`if (!this->focus_object) {`
`94`	`95`	`return;`
`95`	`96`	`}`
`@@ -105,6 +106,7 @@ void KimeInputContext::preedit_str(kime::RustStr s) {`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`void KimeInputContext::commit_str(kime::RustStr s) {`
	`109`	`+ this->focus_object = qApp->focusObject();`
`108`	`110`	`if (!this->focus_object) {`
`109`	`111`	`return;`
`110`	`112`	`}`