Merge "Fix PC Qwerty layout"
This commit is contained in:
commit
ffebac74a4
4 changed files with 29 additions and 37 deletions
|
@ -112,7 +112,7 @@
|
|||
>
|
||||
<key-style
|
||||
latin:styleName="enterKeyStyle"
|
||||
latin:keySpec="!text/label_go_key|!code/key_shift_enter"
|
||||
latin:keySpec="!icon/enter_key|!code/key_shift_enter"
|
||||
latin:parentStyle="defaultEnterKeyStyle" />
|
||||
</case>
|
||||
<case
|
||||
|
|
|
@ -24,37 +24,32 @@
|
|||
<Row
|
||||
latin:keyWidth="7.0%p"
|
||||
>
|
||||
<include
|
||||
latin:keyWidth="9.0%p"
|
||||
latin:keyboardLayout="@xml/key_shortcut" />
|
||||
<switch>
|
||||
<case
|
||||
latin:languageSwitchKeyEnabled="true"
|
||||
>
|
||||
<Key
|
||||
latin:keyStyle="languageSwitchKeyStyle"
|
||||
latin:keyWidth="9.0%p"
|
||||
latin:backgroundType="functional" />
|
||||
latin:keyXPos="22.0%p"
|
||||
latin:keyWidth="9.0%p" />
|
||||
<Key
|
||||
latin:keyStyle="spaceKeyStyle"
|
||||
latin:keyWidth="40.0%p" />
|
||||
</case>
|
||||
</switch>
|
||||
<Key
|
||||
latin:keyStyle="spaceKeyStyle"
|
||||
latin:keyXPos="25.5%p"
|
||||
latin:keyWidth="49.0%p" />
|
||||
<switch>
|
||||
<case
|
||||
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
|
||||
>
|
||||
<include
|
||||
latin:keyXPos="-9.0%p"
|
||||
latin:keyWidth="9.0%p"
|
||||
latin:keyboardLayout="@xml/key_shortcut" />
|
||||
</case>
|
||||
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
|
||||
<default>
|
||||
<include
|
||||
latin:keyXPos="-9.0%p"
|
||||
latin:keyWidth="9.0%p"
|
||||
latin:backgroundType="functional"
|
||||
latin:keyboardLayout="@xml/key_f2" />
|
||||
<Key
|
||||
latin:keyStyle="spaceKeyStyle"
|
||||
latin:keyXPos="29.0%p"
|
||||
latin:keyWidth="42.0%p" />
|
||||
</default>
|
||||
</switch>
|
||||
<include
|
||||
latin:keyXPos="-9.0%p"
|
||||
latin:keyWidth="9.0%p"
|
||||
latin:backgroundType="functional"
|
||||
latin:keyboardLayout="@xml/key_f2" />
|
||||
</Row>
|
||||
</merge>
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
latin:keyWidth="7.0%p"
|
||||
>
|
||||
<Spacer
|
||||
latin:keyWidth="12.0%p" />
|
||||
latin:keyWidth="10.0%p" />
|
||||
<include
|
||||
latin:keyboardLayout="@xml/rowkeys_pcqwerty3" />
|
||||
<Key
|
||||
|
|
|
@ -24,23 +24,21 @@
|
|||
<Row
|
||||
latin:keyWidth="7.692%p"
|
||||
>
|
||||
<Spacer
|
||||
latin:keyWidth="11.538%p" />
|
||||
<switch>
|
||||
<case
|
||||
latin:supportsSwitchingToShortcutIme="true"
|
||||
latin:hasShortcutKey="true"
|
||||
>
|
||||
<Key
|
||||
latin:keyStyle="shortcutKeyStyle"
|
||||
latin:keyWidth="11.538%p" />
|
||||
</case>
|
||||
</case>
|
||||
<case
|
||||
latin:clobberSettingsKey="false"
|
||||
>
|
||||
<Key
|
||||
latin:keyStyle="settingsKeyStyle"
|
||||
latin:keyWidth="11.538%p" />
|
||||
</case>
|
||||
</case>
|
||||
</switch>
|
||||
<switch>
|
||||
<case
|
||||
|
@ -48,24 +46,23 @@
|
|||
>
|
||||
<Key
|
||||
latin:keyStyle="languageSwitchKeyStyle"
|
||||
latin:keyXPos="19.231%p"
|
||||
latin:keyWidth="11.538%p" />
|
||||
<Key
|
||||
latin:keyStyle="spaceKeyStyle"
|
||||
latin:keyWidth="38.464%p" />
|
||||
</case>
|
||||
latin:keyWidth="42.308%p" />
|
||||
</case>
|
||||
<!-- languageSwitchKeyEnabled="false" -->
|
||||
<default>
|
||||
<Key
|
||||
latin:keyStyle="spaceKeyStyle"
|
||||
latin:keyWidth="50.002%p" />
|
||||
latin:keyXPos="26.923%p"
|
||||
latin:keyWidth="46.154%p" />
|
||||
</default>
|
||||
</switch>
|
||||
<Key
|
||||
latin:keyStyle="defaultEnterKeyStyle"
|
||||
latin:keySpec="!icon/enter_key|!code/key_enter"
|
||||
latin:keyWidth="15.384%p" />
|
||||
<Key
|
||||
latin:keyStyle="emojiKeyStyle"
|
||||
latin:keyStyle="enterKeyStyle"
|
||||
latin:keyXPos="-19.231%p"
|
||||
latin:keyWidth="fillRight" />
|
||||
</Row>
|
||||
</merge>
|
||||
|
|
Loading…
Reference in a new issue