Skip to content

correct some settings for HRM presets, rework tooltips on Typing behavior page #2924

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
mhantsch wants to merge 5 commits into
base: master
Choose a base branch
from
+16 −10
Open

correct some settings for HRM presets, rework tooltips on Typing behavior page #2924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2a5bad
correct "trigger from same half" for HRM strategies
May 15, 2026
0f803ab
change "doubletap to primary" setting for "HRM timeout secondary" preset
May 15, 2026
fed13e6
some more tooltip text and formatting changes for "Typing behavior" page
May 15, 2026
516006b
width adjustment
May 15, 2026
4c4b7c0
more tooltip fixes
May 15, 2026
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
7 changes: 3 additions & 4 deletions ...es/uhk-common/src/config-serializer/config-items/advanced-secondary-role-configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const HRM_TIMEOUT_CANCEL_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET: Ad
secondaryRoleAdvancedStrategySafetyMargin: -40,
secondaryRoleAdvancedStrategyDoubletapToPrimary: false,
secondaryRoleAdvancedStrategyTriggerByMouse: true,
secondaryRoleAdvancedStrategyTriggerFromSameHalf: true,
secondaryRoleAdvancedStrategyTriggerFromSameHalf: false,
}
}

Expand All @@ -86,9 +86,9 @@ export const HRM_TIMEOUT_SECONDARY_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET:
secondaryRoleAdvancedStrategyTimeoutType: SecondaryRoleAdvancedStrategyTimeoutType.Active,
secondaryRoleAdvancedStrategyTrigger: SecondaryRoleAdvancedStrategyTriggeringEvent.Release,
secondaryRoleAdvancedStrategySafetyMargin: 1,
secondaryRoleAdvancedStrategyDoubletapToPrimary: false,
secondaryRoleAdvancedStrategyDoubletapToPrimary: true,
secondaryRoleAdvancedStrategyTriggerByMouse: false,
secondaryRoleAdvancedStrategyTriggerFromSameHalf: true,
secondaryRoleAdvancedStrategyTriggerFromSameHalf: false,
}
}

Expand All @@ -109,7 +109,6 @@ export const TIMEOUT_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET: AdvancedSecon
}
}


export const BUILTIN_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESETS: AdvancedSecondaryRoleConfigurationPreset[] = [
SIMPLE_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET,
HRM_TIMEOUT_CANCEL_ADVANCED_SECONDARY_ROLE_CONFIGURATION_PRESET,
Expand Down
19 changes: 13 additions & 6 deletions ...hk-web/src/app/components/device/typing-behavior-page/typing-behavior-page.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ <h5 class="fw-bold d-inline-block">Dual role key</h5>
<circle-tooltip [tooltip]="doubleTapPrimaryTooltip"
[width]="250"/>
<ng-template #doubleTapPrimaryTooltip>
<p>If the dual-role key is double-tapped, the primary role is activated.</p>
<p>Tap-and-Hold (hold on the second tap) to keep the primary role held down.</p>
<p>If the dual-role key is double-tapped, the primary role is activated.
Tap-and-Hold (hold on the second tap) to keep the primary role held down.</p>
Useful when you want to trigger auto-repeat of primary roles on keys such as space.
</ng-template>
</td>
Expand Down Expand Up @@ -216,8 +216,12 @@ <h5 class="fw-bold d-inline-block">Trigger keys</h5>
</tr>
<tr class="separator">
<td>Allow same-side triggers
<circle-tooltip tooltip="When checked, keys on the same half of the keyboard can trigger secondary roles. Turning this off helps avoiding spurious unwanted activations of secondary roles during quick typing and finger rolls. <br/><em>Note:</em> Secondary roles can still be triggered by timeout (or mouse movement). Keeping the dual-role key held down beyond the timeout allows combining it with same-side keys even if this option is turned off."
[width]="250"/>
<circle-tooltip [tooltip]="sameSideTriggersTooltip"
[width]="450"/>
<ng-template #sameSideTriggersTooltip>
<p>When checked, keys on the same half of the keyboard can trigger secondary roles. Turning this off helps avoiding spurious unwanted activations of secondary roles during quick typing and finger rolls.</p>
<em>Note:</em> Secondary roles can still be triggered by timeout (or mouse movement). Keeping the dual-role key held down beyond the timeout allows combining it with same-side keys even if this option is turned off.
</ng-template>
</td>
<td>
<input type="checkbox"
Expand Down Expand Up @@ -255,8 +259,11 @@ <h3 class="margin-top">Miscellaneous</h3>
</tr>
<tr class="separator">
<td>Double tap timeout
<circle-tooltip tooltip="Configures the timeout for most doubletap behaviors in the firmware. (Layer switcher doubletaps, secondary role doubletaps, the `ifDoubletap` macro condition...)"
[width]="250"/>
<circle-tooltip [tooltip]="doubletapTimeoutTooltip"
[width]="300"/>
<ng-template #doubletapTimeoutTooltip>
Configures the timeout for most doubletap behaviors in the firmware. (Layer switcher doubletaps, secondary role doubletaps, the <code>ifDoubletap</code> macro condition...)
</ng-template>
</td>
<td>
<slider-wrapper
Expand Down
Loading