Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ Notes:

---

## v1.2.4.0 - Patch Release

### Bug Fixes

- Fixed issue #7 where some mouse wheel/mouse-axis actions (for example `Mining Increase Laser Power`) were missing from the `Adaptive Dial` function dropdown.
- Fixed function details in the Property Inspector so mouse-axis bindings are shown under `Mouse` instead of incorrectly appearing as `Unbound`.

### Internal / Refactor

- Updated selected `PluginCore` NuGet dependencies to newer patch versions (`Microsoft.CodeAnalysis.NetAnalyzers`, `Microsoft.Extensions.DependencyInjection`, `Microsoft.Extensions.DependencyInjection.Abstractions`, `Microsoft.Win32.SystemEvents`, and `System.Drawing.Common`).

## v1.2.3.0 - Minor Release

### Features / Improvements
Expand Down
10 changes: 5 additions & 5 deletions PluginCore/PluginCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@
<PackageReference Include="NAudio" Version="2.3.0" />
<ProjectReference Include="..\InputSimulatorPlus\WindowsInput\WindowsInput.csproj" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.300">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.301">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.8" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="10.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="NLog" Version="6.1.3" />
<PackageReference Include="SharpZipLibP4k" Version="1.4.2" />
<PackageReference Include="StreamDeck-Tools" Version="7.0.0" />
<PackageReference Include="System.Drawing.Common" Version="10.0.8" />
<PackageReference Include="System.Drawing.Common" Version="10.0.9" />
<PackageReference Include="ZstdSharp.Port" Version="0.8.8" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion PluginCore/PropertyInspector/js/pi-dial-action.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion PluginCore/PropertyInspector/js/sc-components.js

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions PluginCore/PropertyInspector/js/src/pi-dial-action.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
const slotStates = slotConfigs.map((config) => {
const dropdown = SCPI?.ui?.dropdown?.initDropdown?.({
rootId: config.rootId,
placeholder: {key: config.placeholderKey, fallback: config.placeholderFallback},
placeholder: { key: config.placeholderKey, fallback: config.placeholderFallback },
searchEnabled: true,
minLoadingMs: 0,
successFlashMs: 100,
Expand All @@ -54,7 +54,7 @@
getValue: (opt) => String(opt?.value ?? ''),
getGroup: (opt) => String(opt?.group ?? ''),
isDisabled: (opt) => !!opt?.disabled,
onSelect: (opt) => selectOption(config.settingsKey, opt, {persist: true})
onSelect: (opt) => selectOption(config.settingsKey, opt, { persist: true })
});

dropdown?.setLoading?.(true, {
Expand Down Expand Up @@ -82,10 +82,10 @@

SCPI?.ui?.filePicker?.createFilePicker?.({
rootId: 'audioFilePicker',
placeholderText: {key: 'PropertyInspector.Common.FilePicker.NoFileSelected', fallback: 'No file selected'},
buttonText: {key: 'PropertyInspector.Common.FilePicker.Button', fallback: 'FILE'},
selectTitle: {key: 'PropertyInspector.Common.Audio.SelectTitle', fallback: 'Select audio file'},
clearTitle: {key: 'PropertyInspector.Common.Audio.ClearTitle', fallback: 'Clear audio file'},
placeholderText: { key: 'PropertyInspector.Common.FilePicker.NoFileSelected', fallback: 'No file selected' },
buttonText: { key: 'PropertyInspector.Common.FilePicker.Button', fallback: 'FILE' },
selectTitle: { key: 'PropertyInspector.Common.Audio.SelectTitle', fallback: 'Select audio file' },
clearTitle: { key: 'PropertyInspector.Common.Audio.ClearTitle', fallback: 'Clear audio file' },
settingsKey: 'clickSoundPath'
});

Expand Down Expand Up @@ -130,7 +130,7 @@

return flatten(groups, {
requireToggleCandidates: false,
excludeBindingTypes: ['mouseaxis', 'joystick', 'gamepad']
excludeBindingTypes: ['joystick', 'gamepad']
});
}

Expand All @@ -139,7 +139,7 @@

slotStates.forEach((slot) => {
slot.dropdown?.setItems?.(allOptions);
slot.dropdown?.setSelectedValue?.(slot.currentValue, {rerender: false});
slot.dropdown?.setSelectedValue?.(slot.currentValue, { rerender: false });

if (slot.currentValue) {
syncSelection(slot.settingsKey, slot.currentValue);
Expand All @@ -164,7 +164,7 @@
}

const isLegacyMatch = opt.legacyValue === value && opt.value !== value;
selectOption(settingsKey, opt, {persist: isLegacyMatch});
selectOption(settingsKey, opt, { persist: isLegacyMatch });
}

function selectOption(settingsKey, opt, opts = {}) {
Expand All @@ -177,7 +177,7 @@

isSelectingOption = true;
slot.currentValue = opt.value;
slot.dropdown?.setSelectedValue?.(opt.value, {rerender: true});
slot.dropdown?.setSelectedValue?.(opt.value, { rerender: true });
updateFunctionDetails(slot, opt);

if (persist) {
Expand Down Expand Up @@ -259,7 +259,7 @@
slotStates.forEach((slot) => {
const savedValue = slot.getValue();
slot.currentValue = savedValue || '';
slot.dropdown?.setSelectedValue?.(slot.currentValue, {rerender: false});
slot.dropdown?.setSelectedValue?.(slot.currentValue, { rerender: false });
updateFunctionDetails(slot, null);
});

Expand Down
23 changes: 13 additions & 10 deletions PluginCore/PropertyInspector/js/src/sc-common.js
Original file line number Diff line number Diff line change
Expand Up @@ -528,20 +528,23 @@
titleEl.textContent = slotLabel.length > 0 ? `${slotLabel}: ${title}` : title;
}

const deviceAliases = {
mouse: ['mouse', 'mouseaxis']
};

devices.forEach((deviceType) => {
const deviceData = detailDevices.find((d) => d.device && d.device.toLowerCase() === deviceType);
const bindingEl = bindingElements[deviceType] || null;
const matches = deviceAliases[deviceType] || [deviceType];

let bindingValue = unboundText;
if (deviceData && Array.isArray(deviceData.bindings) && deviceData.bindings.length > 0) {
const bindingLines = deviceData.bindings
.map((binding) => String(binding.display || binding.raw || ''))
.filter((text) => text);
const bindingLines = detailDevices
.filter((d) => d.device && matches.includes(d.device.toLowerCase()))
.flatMap((d) => Array.isArray(d.bindings) ? d.bindings : [])
.map((binding) => String(binding.display || binding.raw || ''))
.filter(Boolean);

if (bindingLines.length > 0) {
bindingValue = bindingLines.join(', ');
}
}
const bindingValue = bindingLines.length > 0
? bindingLines.join(', ')
: unboundText;

if (bindingEl) {
bindingEl.textContent = bindingValue;
Expand Down
Loading