Merge pull request #878 from ChiahongHong/pinyin

lukhnos · web-flow · commit d5e06b9c8dfd · 2026-07-15T17:07:06.000-07:00
Fix pinyin mode persisting after switching to another layout
diff --git a/Source/Engine/Mandarin/Mandarin.h b/Source/Engine/Mandarin/Mandarin.h
@@ -381,9 +381,9 @@ class BopomofoReadingBuffer {
 
   void setKeyboardLayout(const BopomofoKeyboardLayout* layout) {
     layout_ = layout;
+    pinyin_mode_ = layout == BopomofoKeyboardLayout::HanyuPinyinLayout();
 
-    if (layout == BopomofoKeyboardLayout::HanyuPinyinLayout()) {
-      pinyin_mode_ = true;
+    if (pinyin_mode_) {
       pinyin_sequence_ = "";
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -381,9 +381,9 @@ class BopomofoReadingBuffer {`
`381`	`381`
`382`	`382`	`void setKeyboardLayout(const BopomofoKeyboardLayout* layout) {`
`383`	`383`	`layout_ = layout;`
	`384`	`+ pinyin_mode_ = layout == BopomofoKeyboardLayout::HanyuPinyinLayout();`
`384`	`385`
`385`		`- if (layout == BopomofoKeyboardLayout::HanyuPinyinLayout()) {`
`386`		`- pinyin_mode_ = true;`
	`386`	`+ if (pinyin_mode_) {`
`387`	`387`	`pinyin_sequence_ = "";`
`388`	`388`	`}`
`389`	`389`	`}`