Skip to content

Commit 58d6834

Browse files
authored
Cinnamon: Fix support for ctrl and alt OSK modifiers. (#529)
Ref: linuxmint/cinnamon#13355
1 parent 2678fee commit 58d6834

File tree

4 files changed

+33
-0
lines changed

4 files changed

+33
-0
lines changed

src/Mint-X/theme/Mint-X/cinnamon/cinnamon.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,6 +1397,8 @@ On-Screen Keyboard (>= Cinnamon 6.6)
13971397
}
13981398

13991399
.vkeyboard-key:active,
1400+
.vkeyboard-key.modifier-key:latched,
1401+
.vkeyboard-key.modifier-key:latched:hover,
14001402
.vkeyboard-key.shift-key-uppercase {
14011403
border-image: url("button-assets/button-pressed.png") 4;
14021404
}
@@ -1405,6 +1407,7 @@ On-Screen Keyboard (>= Cinnamon 6.6)
14051407
.vkeyboard-key.escape-key,
14061408
.vkeyboard-key.hide-key,
14071409
.vkeyboard-key.enter-key,
1410+
.vkeyboard-key.modifier-key,
14081411
.vkeyboard-key.non-alpha-key {
14091412
border-image: url("button-assets/button-darker.png") 4;
14101413
}
@@ -1417,6 +1420,8 @@ On-Screen Keyboard (>= Cinnamon 6.6)
14171420
.vkeyboard-key.escape-key:checked,
14181421
.vkeyboard-key.hide-key:hover,
14191422
.vkeyboard-key.hide-key:checked,
1423+
.vkeyboard-key.modifier-key:hover,
1424+
.vkeyboard-key.modifier-key:checked,
14201425
.vkeyboard-key.non-alpha-key:hover,
14211426
.vkeyboard-key.non-alpha-key:checked {
14221427
border-image: url("button-assets/button-hover.png") 4;
@@ -1426,6 +1431,7 @@ On-Screen Keyboard (>= Cinnamon 6.6)
14261431
.vkeyboard-key.shift-key-lowercase:active,
14271432
.vkeyboard-key.escape-key:active,
14281433
.vkeyboard-key.hide-key:active,
1434+
.vkeyboard-key.modifier-key:active,
14291435
.vkeyboard-key.non-alpha-key:active {
14301436
border-image: url("button-assets/button-pressed.png") 4;
14311437
}

src/Mint-Y/cinnamon/cinnamon-dark.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,6 +1989,15 @@ On-Screen Keyboard (>= Cinnamon 6.6)
19891989
background-color: #35a854;
19901990
border: 1px solid #35a854;
19911991
box-shadow: inset 0 2px 4px #35a854; }
1992+
.vkeyboard-key.modifier-key {
1993+
background-color: #38383e; }
1994+
.vkeyboard-key.modifier-key:hover, .vkeyboard-key.modifier-key:checked {
1995+
color: #e1e1e1;
1996+
background-color: #3c3c44;
1997+
border: 1px solid #303036;
1998+
box-shadow: inset 0 2px 4px rgba(60, 60, 68, 0.05); }
1999+
.vkeyboard-key.modifier-key:latched {
2000+
background-color: #5e5e69; }
19922001
.vkeyboard-key StIcon {
19932002
icon-size: 1.125em; }
19942003

src/Mint-Y/cinnamon/cinnamon.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1991,6 +1991,15 @@ On-Screen Keyboard (>= Cinnamon 6.6)
19911991
background-color: #35a854;
19921992
border: 1px solid #35a854;
19931993
box-shadow: inset 0 2px 4px #35a854; }
1994+
.vkeyboard-key.modifier-key {
1995+
background-color: #c0c0c6; }
1996+
.vkeyboard-key.modifier-key:hover, .vkeyboard-key.modifier-key:checked {
1997+
color: #303030;
1998+
background-color: #bdbdc4;
1999+
border: 1px solid #b5b5bd;
2000+
box-shadow: inset 0 2px 4px rgba(189, 189, 196, 0.05); }
2001+
.vkeyboard-key.modifier-key:latched {
2002+
background-color: #9a9aa5; }
19942003
.vkeyboard-key StIcon {
19952004
icon-size: 1.125em; }
19962005

src/Mint-Y/cinnamon/sass/_keyboard.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ $shifted_key_color: if($variant == 'light', darken($bg_color, 30%), lighten($bg_
5252
&:active { @include button(active); }
5353
}
5454

55+
&.modifier-key {
56+
background-color: $non_alpha_key_color;
57+
58+
&:hover, &:checked { @include button(hover); }
59+
&:latched {
60+
background-color: $shifted_key_color;
61+
}
62+
}
63+
5564
StIcon { icon-size: 1.125em; }
5665
}
5766

0 commit comments

Comments
 (0)