Layouts: Optimise the size of some buttons on some layouts

and clean up some layout-files.

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/655>
This commit is contained in:
MoonlightWave-12
2024-05-04 17:11:46 +02:00
parent c2cce40d84
commit c7e3681e38
24 changed files with 198 additions and 165 deletions

View File

@ -1,13 +1,14 @@
---
outlines:
default: { width: 32.72, height: 52 }
altline: { width: 50.12, height: 52 }
wide: { width: 50.12, height: 52 }
change-view: { width: 50.12, height: 52 }
spaceline: { width: 185, height: 52 }
special: { width: 44, height: 52 }
placeholder: { width: 32.72, height: 52 }
fill: { width: 65.44, height: 52 }
default: { width: 32.72, height: 52 }
altline: { width: 50.12, height: 52 }
wide: { width: 58.99, height: 52 }
change-view: { width: 50.12, height: 52 }
change-view-2: { width: 58.99, height: 52 }
spaceline: { width: 167.26, height: 52 }
special: { width: 44, height: 52 }
placeholder: { width: 32.72, height: 52 }
fill: { width: 65.44, height: 52 }
views:
base:
@ -51,7 +52,7 @@ buttons:
show_numbers:
action:
set_view: "numbers"
outline: "change-view"
outline: "change-view-2"
label: "123"
show_numbers_from_symbols:
action:
@ -61,7 +62,7 @@ buttons:
show_letters:
action:
set_view: "base"
outline: "change-view"
outline: "change-view-2"
label: "ABC"
show_symbols:
action:

View File

@ -1,13 +1,14 @@
---
outlines:
default: { width: 32.72, height: 52 }
altline: { width: 50.12, height: 52 }
wide: { width: 50.12, height: 52 }
change-view: { width: 50.12, height: 52 }
spaceline: { width: 185, height: 52 }
special: { width: 44, height: 52 }
placeholder: { width: 32.72, height: 52 }
fill: { width: 65.44, height: 52 }
default: { width: 32.72, height: 52 }
altline: { width: 50.12, height: 52 }
wide: { width: 58.99, height: 52 }
change-view: { width: 50.12, height: 52 }
change-view-2: { width: 58.99, height: 52 }
spaceline: { width: 167.26, height: 52 }
special: { width: 44, height: 52 }
placeholder: { width: 32.72, height: 52 }
fill: { width: 65.44, height: 52 }
views:
base:
@ -28,7 +29,7 @@ views:
symbols:
- "~ ` | · √ π τ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }"
- "show_numbers -- \\ / < > = [ ] BackSpace"
- "show_numbers_from_symbols -- \\ / < > = [ ] BackSpace"
- "show_letters preferences space , Return"
@ -49,6 +50,11 @@ buttons:
outline: "special"
icon: "keyboard-mode-symbolic"
show_numbers:
action:
set_view: "numbers"
outline: "change-view-2"
label: "123"
show_numbers_from_symbols:
action:
set_view: "numbers"
outline: "change-view"
@ -56,7 +62,7 @@ buttons:
show_letters:
action:
set_view: "base"
outline: "change-view"
outline: "change-view-2"
label: "ABC"
show_symbols:
action:

View File

@ -7,7 +7,6 @@ outlines:
spaceline: { width: 106, height: 52 }
special: { width: 35.33, height: 52 }
change-view-2: { width: 35.33, height: 52 }
placeholder: { width: 35.33, height: 52 }
views:
base:
@ -100,6 +99,3 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
--:
outline: "placeholder"
text: ""

View File

@ -7,7 +7,6 @@ outlines:
spaceline: { width: 162, height: 42 }
special: { width: 54, height: 42 }
change-view-2: { width: 54, height: 42 }
placeholder: { width: 54, height: 42 }
views:
base:
@ -100,6 +99,3 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
--:
outline: "placeholder"
text: ""

View File

@ -7,7 +7,6 @@ outlines:
spaceline: { width: 106, height: 52 }
special: { width: 35.33, height: 52 }
change-view-2: { width: 35.33, height: 52 }
placeholder: { width: 35.33, height: 52 }
views:
base:
@ -100,6 +99,3 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
--:
outline: "placeholder"
text: ""

View File

@ -7,7 +7,6 @@ outlines:
spaceline: { width: 162, height: 42 }
special: { width: 54, height: 42 }
change-view-2: { width: 54, height: 42 }
placeholder: { width: 54, height: 42 }
views:
base:
@ -100,6 +99,3 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
--:
outline: "placeholder"
text: ""

View File

@ -1,9 +1,9 @@
---
outlines:
default: { width: 35.33, height: 52 }
wide: { width: 62, height: 52 }
change-view: { width: 52.67, height: 52 }
change-view-2: { width: 62, height: 52 }
default: { width: 35.33, height: 52 }
wide: { width: 62, height: 52 }
change-view: { width: 52.67, height: 52 }
change-view-2: { width: 62, height: 52 }
spaceline: { width: 106.67, height: 52 }
special: { width: 44, height: 52 }
large: { width: 44, height: 52 }

View File

@ -5,7 +5,7 @@ outlines:
wide: { width: 80, height: 42 }
change-view: { width: 54, height: 42 }
change-view-2: { width: 80, height: 42 }
spaceline: { width: 272, height: 42 }
spaceline: { width: 246, height: 42 }
special: { width: 54, height: 42 }
placeholder: { width: 54, height: 42 }
@ -77,7 +77,7 @@ buttons:
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "change-view"
outline: "change-view-2"
label: "âÂ"
space:
outline: "spaceline"

View File

@ -5,22 +5,23 @@
---
outlines:
default: { width: 40, height: 60 }
special: { width: 52.67, height: 60 }
altline: { width: 57.5, height: 60 }
large: { width: 57.5, height: 60 }
wide: { width: 62, height: 60 }
change-view: { width: 57.5, height: 60 }
change-view-2: { width: 81, height: 60 }
character-group: { width: 72, height: 60 }
spaceline: { width: 143, height: 60 }
spaceline-2: { width: 223, height: 60 }
subtle-highlight: { width: 40, height: 60 }
placeholder: { width: 40, height: 60 }
placeholder-2: { width: 72, height: 60 }
special: { width: 52.67, height: 60 }
fill: { width: 57.5, height: 60 }
altline: { width: 57.5, height: 60 }
large: { width: 57.5, height: 60 }
change-view: { width: 57.5, height: 60 }
wide: { width: 62, height: 60 }
change-view-2: { width: 81, height: 60 }
character-group: { width: 72, height: 60 }
placeholder-2: { width: 72, height: 60 }
spaceline: { width: 143, height: 60 }
spaceline-2: { width: 223, height: 60 }
views:
base:
- "; ς ε ρ τ υ θ ι ο π"
- "; ς ε ρ τ υ θ ι ο π-fill"
- "α σ δ φ γ η ξ κ λ show_accents"
- "Shift_L ζ χ ψ ω β ν μ BackSpace"
- "show_numbers preferences space . ,-subtle-highlight Return"
@ -245,4 +246,27 @@ buttons:
outline: "placeholder-2"
text: ""
᾿:
outline: "large"
outline: "large"
π-fill:
outline: "fill"
text: "π"
Π:
outline: "fill"
0:
outline: "fill"
):
outline: "fill"
:
outline: "fill"
"}":
outline: "fill"
ώ:
outline: "fill"
:
outline: "fill"
:
outline: "fill"
:
outline: "fill"
:
outline: "fill"

View File

@ -6,21 +6,22 @@
outlines:
default: { width: 74, height: 60 }
special: { width: 74, height: 60 }
placeholder: { width: 74, height: 60 }
subtle-highlight: { width: 74, height: 60 }
fill: { width: 97.44, height: 60 }
altline: { width: 97.44, height: 60 }
large: { width: 97.44, height: 60 }
wide: { width: 114.7, height: 60 }
change-view: { width: 97.44, height: 60 }
change-view-2: { width: 114.7, height: 60 }
character-group: { width: 122.1, height: 60 }
wide: { width: 114.7, height: 60 }
character-group: { width: 133.2, height: 60 }
placeholder-2: { width: 133.2, height: 60 }
change-view-2: { width: 148, height: 60 }
spaceline: { width: 279, height: 60 }
spaceline-2: { width: 427, height: 60 }
subtle-highlight: { width: 74, height: 60 }
placeholder: { width: 74, height: 60 }
placeholder-2: { width: 122.1, height: 60 }
views:
base:
- "; ς ε ρ τ υ θ ι ο π"
- "; ς ε ρ τ υ θ ι ο π-fill"
- "α σ δ φ γ η ξ κ λ show_accents"
- "Shift_L ζ χ ψ ω β ν μ BackSpace"
- "show_numbers preferences space . ,-subtle-highlight Return"
@ -245,4 +246,27 @@ buttons:
outline: "placeholder-2"
text: ""
᾿:
outline: "large"
outline: "large"
π-fill:
outline: "fill"
text: "π"
Π:
outline: "fill"
0:
outline: "fill"
):
outline: "fill"
:
outline: "fill"
"}":
outline: "fill"
ώ:
outline: "fill"
:
outline: "fill"
:
outline: "fill"
:
outline: "fill"
:
outline: "fill"

View File

@ -5,16 +5,17 @@
---
outlines:
default: { width: 40, height: 60 }
altline: { width: 52.67, height: 60 }
wide: { width: 62, height: 60 }
change-view: { width: 52.67, height: 60 }
change-view-2: { width: 62, height: 60 }
spaceline: { width: 138, height: 60 }
subtle-highlight: { width: 40, height: 60 }
fill: { width: 52.67, height: 60 }
altline: { width: 52.67, height: 60 }
change-view: { width: 52.67, height: 60 }
wide: { width: 80, height: 60 }
change-view-2: { width: 80, height: 60 }
spaceline: { width: 120, height: 60 }
views:
base:
- "; ς ε ρ τ υ θ ι ο π"
- "; ς ε ρ τ υ θ ι ο π-fill"
- "α σ δ φ γ η ξ κ λ show_accented"
- "Shift_L ζ χ ψ ω β ν μ BackSpace"
- "show_numbers preferences space . ,-subtle-highlight Return"
@ -24,7 +25,7 @@ views:
- "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
- "show_numbers preferences space ·-subtle-highlight ᾿ Return"
accented:
- "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
- "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
- "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_accented"
- "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ — BackSpace"
- "show_numbers preferences space « » Return"
@ -103,3 +104,18 @@ buttons:
outline: "subtle-highlight"
»:
outline: "subtle-highlight"
π-fill:
outline: "fill"
text: "π"
Π:
outline: "fill"
ώ:
outline: "fill"
0:
outline: "fill"
):
outline: "fill"
:
outline: "fill"
"}":
outline: "fill"

View File

@ -3,15 +3,17 @@
outlines:
default: { width: 73, height: 60 }
special: { width: 73, height: 60 }
altline: { width: 110, height: 60 }
wide: { width: 110, height: 60 }
change-view: { width: 110, height: 60 }
spaceline: { width: 291, height: 60 }
subtle-highlight: { width: 73, height: 60 }
fill: { width: 110, height: 60 }
altline: { width: 110, height: 60 }
change-view: { width: 110, height: 60 }
wide: { width: 146, height: 60 }
change-view-2: { width: 146, height: 60 }
spaceline: { width: 256, height: 60 }
views:
base:
- "; ς ε ρ τ υ θ ι ο π"
- "; ς ε ρ τ υ θ ι ο π-fill"
- "α σ δ φ γ η ξ κ λ show_accented"
- "Shift_L ζ χ ψ ω β ν μ BackSpace"
- "show_numbers preferences space . ,-subtle-highlight Return"
@ -21,7 +23,7 @@ views:
- "Shift_L Ζ Χ Ψ Ω Β Ν Μ BackSpace"
- "show_numbers preferences space ·-subtle-highlight ᾿ Return"
accented:
- "ά έ ή ί ϊ ΐ ό ύ ϋ ώ "
- "ά έ ή ί ϊ ΐ ό ύ ϋ ώ"
- "Ά Έ Ή Ί Ϊ Ό Ύ Ϋ Ώ show_accented"
- "Ϗ ϐ ϑ ϗ ϖ ΰ ϕ — BackSpace"
- "show_numbers preferences space « » Return"
@ -41,7 +43,7 @@ buttons:
locking:
lock_view: "upper"
unlock_view: "base"
outline: "change-view"
outline: "change-view-2"
icon: "key-shift"
BackSpace:
outline: "altline"
@ -54,17 +56,17 @@ buttons:
show_numbers:
action:
set_view: "numbers"
outline: "change-view"
outline: "change-view-2"
label: "123"
show_letters:
action:
set_view: "base"
outline: "change-view"
outline: "change-view-2"
label: "ΑΒΓ"
show_symbols:
action:
set_view: "symbols"
outline: "change-view"
outline: "change-view-2"
label: "*/="
show_accented:
action:
@ -100,3 +102,18 @@ buttons:
outline: "subtle-highlight"
»:
outline: "subtle-highlight"
π-fill:
outline: "fill"
text: "π"
Π:
outline: "fill"
ώ:
outline: "fill"
0:
outline: "fill"
):
outline: "fill"
:
outline: "fill"
"}":
outline: "fill"

View File

@ -1,13 +1,13 @@
# Based on work by: soyer <soyer@irl.hu>
---
outlines:
default: { width: 44.75, height: 42 }
altline: { width: 81, height: 42 }
change-view: { width: 81, height: 42 }
change-view-2: { width: 108, height: 42 }
spaceline: { width: 100, height: 42 }
special: { width: 44.75, height: 42 }
placeholder: { width: 44.75, height: 42 }
default: { width: 44.75, height: 42 }
altline: { width: 89.5, height: 42 }
change-view: { width: 89.5, height: 42 }
change-view-2: { width: 67.125, height: 42 }
spaceline: { width: 111.875, height: 42 }
special: { width: 44.75, height: 42 }
placeholder: { width: 44.75, height: 42 }
views:
base:
@ -72,7 +72,7 @@ buttons:
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "change-view"
outline: "change-view-2"
label: "éá"
space:
outline: "spaceline"

View File

@ -7,7 +7,6 @@ outlines:
change-view-2: { width: 62, height: 52 }
spaceline: { width: 135, height: 52 }
special: { width: 35.66, height: 52 }
fill: { width: 64.9, height: 52 }
placeholder: { width: 32.75, height: 52 }
views:

View File

@ -7,8 +7,8 @@ outlines:
wide: { width: 62, height: 52 }
change-view: { width: 52.75, height: 52 }
change-view-2: { width: 62, height: 52 }
spaceline: { width: 82.75, height: 52 }
special: { width: 44, height: 52 }
spaceline: { width: 91.08, height: 52 }
special: { width: 35.67, height: 52 }
placeholder: { width: 35.67, height: 52 }
views:

View File

@ -7,8 +7,8 @@ outlines:
wide: { width: 62, height: 52 }
change-view: { width: 52.75, height: 52 }
change-view-2: { width: 62, height: 52 }
spaceline: { width: 82.75, height: 52 }
special: { width: 44, height: 52 }
spaceline: { width: 91.08, height: 52 }
special: { width: 35.67, height: 52 }
placeholder: { width: 35.67, height: 52 }
views:

View File

@ -1,15 +1,15 @@
---
outlines:
default: { width: 37.46341, height: 52 }
altline: { width: 48.39024, height: 52 }
wide: { width: 88.97561, height: 52 }
spaceline: { width: 120.5853, height: 52 }
default: { width: 37.46, height: 52 }
altline: { width: 48.39, height: 52 }
wide: { width: 88.98, height: 52 }
spaceline: { width: 120.58, height: 52 }
views:
base:
- "1 2 3 parenleft parenright"
- "4 5 6 numbersign asterisk"
- "7 8 9 plus minus"
- "1 2 3 ( )"
- "4 5 6 # *"
- "7 8 9 + -"
- "BackSpace 0 space Return"
buttons:
@ -23,17 +23,4 @@ buttons:
Return:
outline: "wide"
icon: "key-enter"
keysym: "Return"
asterisk:
text: "*"
numbersign:
text: "#"
minus:
text: "-"
plus:
text: "+"
parenleft:
text: "("
parenright:
text: ")"
keysym: "Return"

View File

@ -1,15 +1,15 @@
---
outlines:
default: { width: 37.46341, height: 42 }
altline: { width: 48.39024, height: 42 }
wide: { width: 88.97561, height: 42 }
spaceline: { width: 120.5853, height: 42 }
default: { width: 37.46, height: 42 }
altline: { width: 48.39, height: 42 }
wide: { width: 88.98, height: 42 }
spaceline: { width: 120.58, height: 42 }
views:
base:
- "1 2 3 parenleft parenright"
- "4 5 6 numbersign asterisk"
- "7 8 9 plus minus"
- "1 2 3 ( )"
- "4 5 6 # *"
- "7 8 9 + -"
- "BackSpace 0 space Return"
buttons:
@ -23,17 +23,4 @@ buttons:
Return:
outline: "wide"
icon: "key-enter"
keysym: "Return"
asterisk:
text: "*"
numbersign:
text: "#"
minus:
text: "-"
plus:
text: "+"
parenleft:
text: "("
parenright:
text: ")"
keysym: "Return"

View File

@ -9,7 +9,6 @@ outlines:
spaceline: { width: 136.39, height: 52 }
special: { width: 48, height: 52 }
placeholder: { width: 32, height: 52 }
fill: { width: 64, height: 52 }
views:
base:

View File

@ -4,14 +4,14 @@ outlines:
subtle-highlight: { width: 35.33, height: 45.5 }
halfwidth: { width: 17.665, height: 45.5 }
narrow: { width: 26.335, height: 45.5 }
special: { width: 44, height: 45.5 }
special: { width: 35.33, height: 45.5 }
altline: { width: 52.67, height: 45.5 }
change-view: { width: 52.67, height: 45.5 }
large: { width: 52.67, height: 45.5 }
action: { width: 59, height: 45.5 }
wide: { width: 59, height: 45.5 }
change-view-2: { width: 59, height: 45.5 }
spaceline: { width: 92.29, height: 45.5 }
spaceline: { width: 100.96, height: 45.5 }
small: { width: 50.471, height: 24 }
placeholder: { width: 17.665, height: 45.5 }

View File

@ -10,8 +10,8 @@ outlines:
large: { width: 52.67, height: 45.5 }
wide: { width: 59, height: 45.5 }
change-view-2: { width: 59, height: 45.5 }
spaceline: { width: 92.29, height: 45.5 }
special: { width: 44, height: 45.5 }
spaceline: { width: 100.96, height: 45.5 }
special: { width: 35.33, height: 45.5 }
small: { width: 50.471, height: 24 }
views:

View File

@ -8,8 +8,8 @@ outlines:
large: { width: 52.67, height: 45.5 }
wide: { width: 59, height: 45.5 }
change-view-2: { width: 59, height: 45.5 }
spaceline: { width: 92.29, height: 45.5 }
special: { width: 44, height: 45.5 }
spaceline: { width: 100.96, height: 45.5 }
special: { width: 35.33, height: 45.5 }
views:
base:

View File

@ -11,7 +11,7 @@ outlines:
action: { width: 59, height: 45.5 }
wide: { width: 59, height: 45.5 }
change-view-2: { width: 59, height: 45.5 }
spaceline: { width: 144.96, height: 45.5 }
spaceline: { width: 138.63, height: 45.5 }
small: { width: 50.471, height: 24 }
views:
@ -37,7 +37,7 @@ views:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "~ ` · √ π τ ÷ × ¶ @"
- "-- © ® £ € ¥ ^ ° { } --"
- "show_numbers % | < > = [ ] BackSpace"
- "show_numbers_from_symbols % | < > = [ ] BackSpace"
- "show_letters preferences space . Return"
actions:
- "TabSmall Ctrl Alt PageUp PageDown Home End"
@ -63,6 +63,11 @@ buttons:
outline: "special"
icon: "keyboard-mode-symbolic"
show_numbers:
action:
set_view: "numbers"
outline: "change-view-2"
label: "123"
show_numbers_from_symbols:
action:
set_view: "numbers"
outline: "change-view"
@ -70,7 +75,7 @@ buttons:
show_letters:
action:
set_view: "base"
outline: "change-view"
outline: "change-view-2"
label: "ABC"
show_letters_actions:
action:

View File

@ -8,7 +8,7 @@ outlines:
change-view: { width: 67.67, height: 42 }
fill: { width: 90.22, height: 42 }
subtle-highlight-2: { width: 90.22, height: 42 }
spaceline: { width: 212.2, height: 42 }
spaceline: { width: 202.98, height: 42 }
special: { width: 45.11, height: 42 }
placeholder: { width: 45.11, height: 42 }
@ -17,22 +17,22 @@ views:
- "f g ğ i o d r n h p q w"
- "u i e a ü t k m l y ş x"
- "Shift_L j ö v c ç z s b -- BackSpace"
- "show_numbers show_eschars preferences space ,-narrow .-narrow Return"
- "show_numbers show_eschars preferences space , . Return"
upper:
- "F G Ğ I O D R N H P Q W"
- "U I E A Ü T K M L Y Ş X"
- "Shift_L J Ö V C Ç Z S B -- BackSpace"
- "show_numbers show_eschars preferences space !-narrow ?-narrow Return"
- "show_numbers show_eschars preferences space ! ? Return"
numbers:
- "1 2 3 4 5 6 7 8 9 0"
- "@ # ₺ % & - _ + ( )"
- "show_symbols -- ; \" ' : = < > -- BackSpace"
- "show_letters show_eschars preferences space ,-narrow .-narrow Return"
- "show_letters show_eschars preferences space , . Return"
symbols:
- "~ ` € | · √ µ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }"
- "show_numbers -- \\ / § π τ [ ] -- BackSpace"
- "show_letters show_eschars preferences space ,-narrow .-narrow Return"
- "show_letters show_eschars preferences space , . Return"
eschars:
- "ä æ é ö-subtle-highlight ü-subtle-highlight Ä Æ É Ö-subtle-highlight Ü-subtle-highlight"
- "à â ê î ô À Â Ê Î Ô"
@ -84,22 +84,6 @@ buttons:
outline: "altline"
icon: "key-enter"
keysym: "Return"
û:
outline: "narrow"
Û:
outline: "narrow"
",-narrow":
outline: "narrow"
text: ","
.-narrow:
outline: "narrow"
text: "."
"!-narrow":
outline: "narrow"
text: "!"
?-narrow:
outline: "narrow"
text: "?"
--:
outline: "placeholder"
text: ""