floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KeyHandler & mgrPrefs // Aftermath of Swift Clang-Format.

This commit is contained in:
ShikiSuen 2022-04-03 12:38:51 +08:00
parent 1803a5a5b0
commit eedf95f307
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Modules/ControllerModules/KeyHandler.mm
View File

@ -176,33 +176,33 @@ static NSString *const kGraphVizOutputfile = @"/tmp/vChewing-visualization.dot";
{
NSInteger layout = mgrPrefs.keyboardLayout;
switch (layout) {
case KeyboardLayoutStandard:
case KeyboardLayoutOfStandard:
_bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::StandardLayout());
break;
case KeyboardLayoutEten:
case KeyboardLayoutOfEten:
_bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::ETenLayout());
break;
case KeyboardLayoutHsu:
case KeyboardLayoutOfHsu:
_bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::HsuLayout());
break;
case KeyboardLayoutEten26:
case KeyboardLayoutOfEen26:
_bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::ETen26Layout());
break;
case KeyboardLayoutIBM:
case KeyboardLayoutOfIBM:
_bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::IBMLayout());
break;
case KeyboardLayoutMiTAC:
case KeyboardLayoutOfMiTAC:
_bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::MiTACLayout());
break;
case KeyboardLayoutFakeSeigyou:
case KeyboardLayoutOfFakeSeigyou:
_bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::FakeSeigyouLayout());
break;
case KeyboardLayoutHanyuPinyin:
case KeyboardLayoutOfHanyuPinyin:
_bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::HanyuPinyinLayout());
break;
default:
_bpmfReadingBuffer->setKeyboardLayout(Mandarin::BopomofoKeyboardLayout::StandardLayout());
mgrPrefs.keyboardLayout = KeyboardLayoutStandard;
mgrPrefs.keyboardLayout = KeyboardLayoutOfStandard;
}
}

34
Source/Modules/IMEModules/mgrPrefs.swift
View File

@ -156,32 +156,32 @@ struct ComposingBufferSize {
// MARK: -
@objc enum KeyboardLayout: Int {
case standard = 0
case eten = 1
case hsu = 2
case eten26 = 3
case ibm = 4
case mitac = 5
case fakeSeigyou = 6
case hanyuPinyin = 10
case ofStandard = 0
case ofEten = 1
case ofHsu = 2
case ofEen26 = 3
case ofIBM = 4
case ofMiTAC = 5
case ofFakeSeigyou = 6
case ofHanyuPinyin = 10
var name: String {
switch self {
case .standard:
case .ofStandard:
return "Standard"
case .eten:
case .ofEten:
return "ETen"
case .hsu:
case .ofHsu:
return "Hsu"
case .eten26:
case .ofEen26:
return "ETen26"
case .ibm:
case .ofIBM:
return "IBM"
case .mitac:
case .ofMiTAC:
return "MiTAC"
case .fakeSeigyou:
case .ofFakeSeigyou:
return "FakeSeigyou"
case .hanyuPinyin:
case .ofHanyuPinyin:
return "HanyuPinyin"
}
}
@ -360,7 +360,7 @@ struct ComposingBufferSize {
@objc static var keyboardLayout: Int
@objc static var keyboardLayoutName: String {
(KeyboardLayout(rawValue: self.keyboardLayout) ?? KeyboardLayout.standard).name
(KeyboardLayout(rawValue: self.keyboardLayout) ?? KeyboardLayout.ofStandard).name
}
@UserDefault(