ref edbee#132, enabling inputMethodEvent for linux, re-enabling diacritics support

gamecreature · gamecreature · commit 2f3b2fecbe78 · 2022-01-20T07:45:20.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 edbee.lib:
 
+- fix #132, Writing diacritics in Linux
 - ref #128, Build in supprort for virtual characters. Alternate position/cursor calculations via TextLayout
 - ref #127,
   - Option to show Unicode BIDI characters (CVE-2021-425740). (as red icons for now)
diff --git a/edbee-lib/edbee/views/components/texteditorcomponent.cpp b/edbee-lib/edbee/views/components/texteditorcomponent.cpp
@@ -346,8 +346,6 @@ void TextEditorComponent::keyReleaseEvent(QKeyEvent *event)
 
 void TextEditorComponent::inputMethodEvent( QInputMethodEvent* m )
 {
- #ifndef Q_OS_LINUX
-
 /// TODO: https://doc.qt.io/qt-5/qinputmethodevent.html
 /// Analyize how to implement this. The preeditString should NOT alter the undo-buffer
 
@@ -366,15 +364,12 @@ void TextEditorComponent::inputMethodEvent( QInputMethodEvent* m )
 */
 
     if( !m->preeditString().isEmpty() ) {
-//        replaceSelection(m->preeditString());
         controller()->replaceSelection(m->preeditString(),false, true);
     } else {
         controller()->replaceSelection(m->commitString(),false);
     }
 
     m->accept();
-
- #endif
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -346,8 +346,6 @@ void TextEditorComponent::keyReleaseEvent(QKeyEvent *event)`
`346`	`346`
`347`	`347`	`void TextEditorComponent::inputMethodEvent( QInputMethodEvent* m )`
`348`	`348`	`{`
`349`		`- #ifndef Q_OS_LINUX`
`350`		`-`
`351`	`349`	`/// TODO: https://doc.qt.io/qt-5/qinputmethodevent.html`
`352`	`350`	`/// Analyize how to implement this. The preeditString should NOT alter the undo-buffer`
`353`	`351`
`@@ -366,15 +364,12 @@ void TextEditorComponent::inputMethodEvent( QInputMethodEvent* m )`
`366`	`364`	`*/`
`367`	`365`
`368`	`366`	`if( !m->preeditString().isEmpty() ) {`
`369`		`-// replaceSelection(m->preeditString());`
`370`	`367`	`controller()->replaceSelection(m->preeditString(),false, true);`
`371`	`368`	`} else {`
`372`	`369`	`controller()->replaceSelection(m->commitString(),false);`
`373`	`370`	`}`
`374`	`371`
`375`	`372`	`m->accept();`
`376`		`-`
`377`		`- #endif`
`378`	`373`	`}`
`379`	`374`
`380`	`375`