s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'highlight-buttons' into 'main'

Browse Source 
Add a button-style for subtle highlighting

See merge request World/Phosh/squeekboard!637
This commit is contained in:
Marge Bot
2024-04-10 15:37:17 +00:00
parent e0092bd860 5ac85d21b9
commit b043e1a7cb
6 changed files with 122 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
data/keyboards/de.yaml
View File

@ -1,11 +1,12 @@
--- ---
outlines: outlines:
default: { width: 35.33, height: 52 } default: { width: 35.33, height: 52 }
altline: { width: 52.67, height: 52 } subtle-highlight: { width: 35.33, height: 52 }
change-view: { width: 52.67, height: 52 } altline: { width: 52.67, height: 52 }
wide: { width: 62, height: 52 } change-view: { width: 52.67, height: 52 }
spaceline: { width: 89.3, height: 52 } wide: { width: 62, height: 52 }
special: { width: 35.33, height: 52 } spaceline: { width: 89.3, height: 52 }
special: { width: 35.33, height: 52 }
views: views:
base: base:
@ -31,7 +32,7 @@ views:
eschars: eschars:
- "ä è é ö ü Ä È É Ö Ü" - "ä è é ö ü Ä È É Ö Ü"
- "à â ê î ô À Â È Î Ô" - "à â ê î ô À Â È Î Ô"
- "show_numbers « » ç Ç æ œ ß BackSpace" - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
- "show_letters show_eschars preferences space „ “ Return" - "show_letters show_eschars preferences space „ “ Return"
buttons: buttons:
@ -79,3 +80,18 @@ buttons:
outline: "altline" outline: "altline"
icon: "key-enter" icon: "key-enter"
keysym: "Return" keysym: "Return"
ä:
outline: "subtle-highlight"
ö:
outline: "subtle-highlight"
ü:
outline: "subtle-highlight"
Ä:
outline: "subtle-highlight"
Ö:
outline: "subtle-highlight"
Ü:
outline: "subtle-highlight"
ß-subtle-highlight:
outline: "subtle-highlight"
text: "ß"

44
data/keyboards/de_wide.yaml
View File

@ -1,14 +1,15 @@
--- ---
outlines: outlines:
default: { width: 48, height: 42 } default: { width: 48, height: 42 }
halfwidth: { width: 24, height: 42 } subtle-highlight: { width: 48, height: 42 }
thin: { width: 30, height: 42 } halfwidth: { width: 24, height: 42 }
narrow: { width: 40.5, height: 42 } thin: { width: 30, height: 42 }
altline: { width: 81, height: 42 } narrow: { width: 40.5, height: 42 }
change-view: { width: 81, height: 42 } altline: { width: 81, height: 42 }
wide: { width: 108, height: 42 } change-view: { width: 81, height: 42 }
spaceline: { width: 156, height: 42 } wide: { width: 108, height: 42 }
special: { width: 48, height: 42 } spaceline: { width: 156, height: 42 }
special: { width: 48, height: 42 }
views: views:
base: base:
@ -32,9 +33,9 @@ views:
- "show_numbers \\ / § π τ [ ] BackSpace" - "show_numbers \\ / § π τ [ ] BackSpace"
- "show_letters show_eschars preferences space ,-narrow .-narrow Return" - "show_letters show_eschars preferences space ,-narrow .-narrow Return"
eschars: eschars:
- "ä è é ö ü Ä È É Ö Ü" - "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
- "à â ê î ô À Â È Î Ô" - "à â ê î ô À Â È Î Ô"
- "show_numbers « » ç Ç æ œ ß BackSpace" - "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
- "show_letters show_eschars preferences space „ “ Return" - "show_letters show_eschars preferences space „ “ Return"
buttons: buttons:
@ -104,3 +105,24 @@ buttons:
ß-thin: ß-thin:
outline: "thin" outline: "thin"
text: "ß" text: "ß"
ä-subtle-highlight:
outline: "subtle-highlight"
text: "ä"
ö-subtle-highlight:
outline: "subtle-highlight"
text: "ö"
ü-subtle-highlight:
outline: "subtle-highlight"
text: "ü"
Ä-subtle-highlight:
outline: "subtle-highlight"
text: "Ä"
Ö-subtle-highlight:
outline: "subtle-highlight"
text: "Ö"
Ü-subtle-highlight:
outline: "subtle-highlight"
text: "Ü"
ß-subtle-highlight:
outline: "subtle-highlight"
text: "ß"

35
data/keyboards/terminal/de.yaml
View File

@ -1,15 +1,16 @@
--- ---
outlines: outlines:
default: { width: 35.33, height: 46 } default: { width: 35.33, height: 46 }
halfwidth: { width: 17.665, height: 46 } subtle-highlight: { width: 35.33, height: 46 }
narrow: { width: 26.335, height: 46 } halfwidth: { width: 17.665, height: 46 }
special: { width: 44, height: 46 } narrow: { width: 26.335, height: 46 }
altline: { width: 52.67, height: 46 } special: { width: 44, height: 46 }
large: { width: 52.67, height: 46 } altline: { width: 52.67, height: 46 }
action: { width: 59, height: 46 } large: { width: 52.67, height: 46 }
wide: { width: 59, height: 46 } action: { width: 59, height: 46 }
spaceline: { width: 92.29, height: 46 } wide: { width: 59, height: 46 }
small: { width: 50.471, height: 22 } spaceline: { width: 92.29, height: 46 }
small: { width: 50.471, height: 22 }
views: views:
base: base:
@ -245,3 +246,17 @@ buttons:
outline: "halfwidth" outline: "halfwidth"
_: _:
outline: "halfwidth" outline: "halfwidth"
ä:
outline: "subtle-highlight"
ö:
outline: "subtle-highlight"
ü:
outline: "subtle-highlight"
Ä:
outline: "subtle-highlight"
Ö:
outline: "subtle-highlight"
Ü:
outline: "subtle-highlight"
ß:
outline: "subtle-highlight"

35
data/keyboards/terminal/de_wide.yaml
View File

@ -1,15 +1,16 @@
--- ---
outlines: outlines:
default: { width: 54, height: 37 } default: { width: 54, height: 37 }
halfwidth: { width: 27, height: 37 } subtle-highlight: { width: 54, height: 37 }
narrow: { width: 40.5, height: 37 } halfwidth: { width: 27, height: 37 }
special: { width: 54, height: 37 } narrow: { width: 40.5, height: 37 }
altline: { width: 81, height: 37 } special: { width: 54, height: 37 }
large: { width: 81, height: 37 } altline: { width: 81, height: 37 }
action: { width: 90, height: 37 } large: { width: 81, height: 37 }
wide: { width: 90, height: 37 } action: { width: 90, height: 37 }
spaceline: { width: 153, height: 37 } wide: { width: 90, height: 37 }
small: { width: 67.4, height: 22 } spaceline: { width: 153, height: 37 }
small: { width: 67.4, height: 22 }
views: views:
base: base:
@ -249,3 +250,17 @@ buttons:
outline: "halfwidth" outline: "halfwidth"
_: _:
outline: "halfwidth" outline: "halfwidth"
ä:
outline: "subtle-highlight"
ö:
outline: "subtle-highlight"
ü:
outline: "subtle-highlight"
Ä:
outline: "subtle-highlight"
Ö:
outline: "subtle-highlight"
Ü:
outline: "subtle-highlight"
ß:
outline: "subtle-highlight"

8
data/style-Adwaita:dark.css
View File

@ -13,6 +13,14 @@ sq_button:active {
background: #747077; background: #747077;
} }
sq_button.subtle-highlight {
background: #3f3e41;
}
sq_button.subtle-highlight:active {
background: #676669;
}
sq_button.emoji-group { sq_button.emoji-group {
background: #3f3e41; background: #3f3e41;
border-bottom: 0.4999px; border-bottom: 0.4999px;

8
data/style.css
View File

@ -14,6 +14,14 @@ sq_button:active {
background: alpha(@theme_fg_color, 0.11); background: alpha(@theme_fg_color, 0.11);
} }
sq_button.subtle-highlight {
background: alpha(@theme_fg_color, 0.105);
}
sq_button.subtle-highlight:active {
background: alpha(@theme_fg_color, 0.16);
}
sq_button.emoji-group { sq_button.emoji-group {
background: alpha(@theme_fg_color, 0.105); background: alpha(@theme_fg_color, 0.105);
border-bottom: 0.4999px; border-bottom: 0.4999px;