Skip to content

Show the keycode in the tooltip #175

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
MarcelRobitaille wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Show the keycode in the tooltip #175

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
6 changes: 4 additions & 2 deletions src/components/two-string/unit-key/keycap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,8 @@ export const Keycap: React.FC<TwoStringKeycapProps> = React.memo((props) => {
idx,
mode,
]);
const primaryTooltip = macroData || (label && label.tooltipLabel)
const secondaryTooltip = label?.keyCode
return shouldRotate ? (
<EncoderKey
onClick={onClick}
Expand Down Expand Up @@ -405,10 +407,10 @@ export const Keycap: React.FC<TwoStringKeycapProps> = React.memo((props) => {
<canvas ref={canvasRef} style={{}} />
</CanvasContainer>
</GlowContainer>
{(macroData || overflowsTexture) && (
{(macroData || overflowsTexture || (label?.tooltipLabel) || (label?.keyCode)) && (
<TooltipContainer $rotate={rotation[2]}>
<Keycap2DTooltip>
{macroData || (label && label.tooltipLabel)}
{primaryTooltip || secondaryTooltip}{secondaryTooltip && primaryTooltip && ` (${secondaryTooltip})`}
</Keycap2DTooltip>
</TooltipContainer>
)}
Expand Down
5 changes: 5 additions & 0 deletions src/utils/keyboard-rendering.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,8 @@ export const getLabel = (
tooltipLabel = macroExpression || '';
}

const keyCode = byteToKey[keycodeByte];

if (isAlpha(label) || isNumpadNumber(label)) {
return (
label && {
Expand All @@ -499,6 +501,7 @@ export const getLabel = (
key: (label || '') + (macroExpression || ''),
size: size,
offset: offset,
keyCode,
}
);
} else if (isMultiLegend(label)) {
Expand All @@ -512,6 +515,7 @@ export const getLabel = (
key: (label || '') + (macroExpression || ''),
size: size,
offset: getLabelOffsets(topLabel, bottomLabel),
keyCode,
}
);
} else {
Expand All @@ -529,6 +533,7 @@ export const getLabel = (
key: (label || '') + (macroExpression || ''),
size: size,
offset: offset,
keyCode,
};
}
};