Fix merge conflicts with #664

Riey · Apr 6, 2024 · 14ed789 · 14ed789
2 parents 7bafe3f + 01ee479
commit 14ed789
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -9,6 +9,7 @@
 * Add ubuntu-22.10 Dockerfile **[@OctopusET]**
 * Fix KDE autostart [#576](https://github.com/Riey/kime/issues/576)
 * Add unicode prime symbols to math mode. (prime, double prime, triple prime, quadruple prime)
+* Fix to work on wlroots>=0.17.1 (Sway 1.9) [#664](https://github.com/Riey/kime/issues/664)
 * Add wayland zwp_input_method_v1 support **[@Jhyub]**
 
 ## 3.0.2

diff --git a/src/frontends/wayland/src/input_method_v2.rs b/src/frontends/wayland/src/input_method_v2.rs
@@ -135,7 +135,6 @@ impl KimeContext {
 
     fn commit(&mut self) {
         self.im.commit(self.serial);
-        self.serial += 1;
     }
 
     fn commit_string(&mut self, s: String) {
@@ -166,6 +165,7 @@ impl KimeContext {
                 panic!("Unavailable")
             }
             ImEvent::Done => {
+                self.serial += 1;
                 if !self.current_state.activate && self.pending_state.activate {
                     self.engine.update_layout_state();
                     if !self.engine_ready {
@@ -337,7 +337,6 @@ impl KimeContext {
                 key,
                 state: KeyState::Pressed,
             };
-            self.serial += 1;
             self.handle_key_ev(ev);
         } else {
             log::warn!("Received timer event when it has never received RepeatInfo.");