Skip to content

Display levels 7 & 8, shifting dk to the left on AltGr #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Display levels 7 & 8, shifting dk to the left on AltGr #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,22 @@ export function drawKey(element, keyMap) {
${keyLevel(4, salt, { x: 0.70, y: 0.41 })}
${keyLevel(5, '', { x: 0.70, y: 0.79 })}
${keyLevel(6, '', { x: 0.70, y: 0.41 })}
${keyLevel(7, '', { x: 0.70, y: 0.79 })}
${keyLevel(8, '', { x: 0.70, y: 0.41 })}
`;
}

export function drawDK(element, keyMap, deadKey) {
const drawChar = (element, content) => {
if (isDeadKey(content)) {
element.classList.add('deadKey', 'diacritic');
element.textContent = content[1];
let symbol = dkSymbols[content] || '';
symbol = symbol || (content || '').slice(-1);
element.textContent = symbol;
if(symbol.startsWith(' ')){
element.classList.add('deadKey', 'diacritic');
} else {
element.classList.add('deadKey');
}
} else {
element.classList.remove('deadKey', 'diacritic');
element.textContent = content || '';
Expand All @@ -164,9 +172,13 @@ export function drawDK(element, keyMap, deadKey) {

const alt0 = deadKey[keyChars[0]];
const alt1 = deadKey[keyChars[1]];
const alt2 = deadKey[keyChars[2]];
const alt3 = deadKey[keyChars[3]];

drawChar(element.querySelector('.level5'), alt0);
drawChar(element.querySelector('.level6'), altUpperChar(alt0, alt1));
drawChar(element.querySelector('.level6'), isDeadKey(alt1) ? alt1 : altUpperChar(alt0, alt1));
drawChar(element.querySelector('.level7'), alt2);
drawChar(element.querySelector('.level8'), isDeadKey(alt3) ? alt3 : altUpperChar(alt2, alt3));
}

/**
Expand Down
16 changes: 11 additions & 5 deletions src/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ const themes = `

/* dimmed AltGr + bold dead keys */
.level3, .level4 { fill: ${KEY_COLOR_L3}; opacity: .5; }
.level5, .level6 { fill: ${KEY_COLOR_L5}; }
.level5, .level6, .level7, .level8 { fill: ${KEY_COLOR_L5}; }
.deadKey {
fill: ${DEAD_KEY_COLOR};
font-size: 14px;
Expand All @@ -284,10 +284,16 @@ const themes = `
/* highlight AltGr + Dead Keys */
.dk .level1, .altgr .level1,
.dk .level2, .altgr .level2 { opacity: 0.25; }
.dk .level5, .altgr .level3,
.dk .level6, .altgr .level4 { opacity: 1; }
.dk .level3,
.dk .level4 { display: none; }
.altgr .level3, .altgr .level4 { opacity: 1; }
.dk .level3, .dk .level4 { display: none; }

/* shift dead keys to the left when AltGr is pressed */
.level5, .level6 { transform: translate(0); }
.level7, .level8 { transform: translate(1.2em); opacity: 0; }
.dk .level5, .dk .level6 { transform: translate(0); transition-duration: 0.3s; }
.altgr .level5, .altgr .level6 { transform: translate(-1.2em); transition-duration: 0.3s; }
.dk .level7, .dk .level8 { opacity: 0; transform: translate(1.2em); transition-duration: 0.3s; }
.altgr .level7, .altgr .level8 { opacity: 1; transform: translate(0); transition-duration: 0.3s; }

@media (prefers-color-scheme: dark) {
rect, path { stroke: #777; fill: #444; }
Expand Down