From d79ab91a04dd36f95f2f165221ed9d426e00519d Mon Sep 17 00:00:00 2001 From: "NGnius (Graham)" Date: Mon, 20 Feb 2023 22:16:19 -0500 Subject: [PATCH] Fix slider out-of-order jumping by removing extra set_value()s --- pnpm-lock.yaml | 12 ++++----- src/components/cpus.tsx | 56 ++++++++++++++++++++--------------------- src/components/gpu.tsx | 46 ++++++++++++++++----------------- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 64137bf..e182984 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -380,8 +380,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001456 - electron-to-chromium: 1.4.302 + caniuse-lite: 1.0.30001457 + electron-to-chromium: 1.4.303 node-releases: 2.0.10 update-browserslist-db: 1.0.10_browserslist@4.21.5 dev: true @@ -395,8 +395,8 @@ packages: engines: {node: '>=6'} dev: true - /caniuse-lite/1.0.30001456: - resolution: {integrity: sha512-XFHJY5dUgmpMV25UqaD4kVq2LsiaU5rS8fb0f17pCoXQiQslzmFgnfOxfvo1bTpTqf7dwG/N/05CnLCnOEKmzA==} + /caniuse-lite/1.0.30001457: + resolution: {integrity: sha512-SDIV6bgE1aVbK6XyxdURbUE89zY7+k1BBBaOwYwkNCglXlel/E7mELiHC64HQ+W0xSKlqWhV9Wh7iHxUjMs4fA==} dev: true /chrome-trace-event/1.0.3: @@ -429,8 +429,8 @@ packages: engines: {node: '>=0.10.0'} dev: true - /electron-to-chromium/1.4.302: - resolution: {integrity: sha512-Uk7C+7aPBryUR1Fwvk9VmipBcN9fVsqBO57jV2ZjTm+IZ6BMNqu7EDVEg2HxCNufk6QcWlFsBkhQyQroB2VWKw==} + /electron-to-chromium/1.4.303: + resolution: {integrity: sha512-XaqiQhVsGO5ymf/Lg6XEGpv2h8b5AFqQDQ9fQckolNP2VtD2VL1pn1TIx1SSYsf0srfXVi2Sm7n/K3slJSX3ig==} dev: true /enhanced-resolve/5.12.0: diff --git a/src/components/cpus.tsx b/src/components/cpus.tsx index 6c94c22..52872bd 100644 --- a/src/components/cpus.tsx +++ b/src/components/cpus.tsx @@ -175,9 +175,9 @@ export class Cpus extends Component { set_value(CLOCK_MIN_CPU, freq); for (let i = 0; i < total_cpus; i++) { backend.resolve(backend.setCpuClockLimits(i, freq, get_value(CLOCK_MAX_CPU)), - (limits: number[]) => { - set_value(CLOCK_MIN_CPU, limits[0]); - set_value(CLOCK_MAX_CPU, limits[1]); + (_limits: number[]) => { + //set_value(CLOCK_MIN_CPU, limits[0]); + //set_value(CLOCK_MAX_CPU, limits[1]); syncPlebClockToAdvanced(); }); } @@ -206,9 +206,9 @@ export class Cpus extends Component { set_value(CLOCK_MAX_CPU, freq); for (let i = 0; i < total_cpus; i++) { backend.resolve(backend.setCpuClockLimits(i, get_value(CLOCK_MIN_CPU), freq), - (limits: number[]) => { - set_value(CLOCK_MIN_CPU, limits[0]); - set_value(CLOCK_MAX_CPU, limits[1]); + (_limits: number[]) => { + //set_value(CLOCK_MIN_CPU, limits[0]); + //set_value(CLOCK_MAX_CPU, limits[1]); syncPlebClockToAdvanced(); }); } @@ -273,14 +273,14 @@ export class Cpus extends Component { onChange={(status: boolean) => { backend.log(backend.LogLevel.Debug, "CPU " + advancedCpu.toString() + " is now " + status.toString()); if (!get_value(SMT_CPU)) { - backend.resolve(backend.setCpuSmt(true), (_newVal: boolean[]) => { - set_value(SMT_CPU, true); - }); + backend.resolve(backend.setCpuSmt(true), (_newVal: boolean[]) => { + set_value(SMT_CPU, true); + }); } backend.resolve(backend.setCpuOnline(advancedCpuIndex, status), (newVal: boolean) => { - const onlines = get_value(ONLINE_STATUS_CPUS); - onlines[advancedCpuIndex] = newVal; - set_value(ONLINE_STATUS_CPUS, onlines); + const onlines = get_value(ONLINE_STATUS_CPUS); + onlines[advancedCpuIndex] = newVal; + set_value(ONLINE_STATUS_CPUS, onlines); }); }} /> @@ -292,24 +292,24 @@ export class Cpus extends Component { description={tr("Set bounds on clock speed")} onChange={(value: boolean) => { if (value) { - const clocks = get_value(CLOCK_MIN_MAX_CPU) as MinMax[]; - if ((get_value(LIMITS_INFO) as backend.SettingsLimits).cpu.cpus[advancedCpuIndex].clock_min_limits != null) { - clocks[advancedCpuIndex].min = (get_value(LIMITS_INFO) as backend.SettingsLimits).cpu.cpus[advancedCpuIndex].clock_min_limits!.min; - } + const clocks = get_value(CLOCK_MIN_MAX_CPU) as MinMax[]; + if ((get_value(LIMITS_INFO) as backend.SettingsLimits).cpu.cpus[advancedCpuIndex].clock_min_limits != null) { + clocks[advancedCpuIndex].min = (get_value(LIMITS_INFO) as backend.SettingsLimits).cpu.cpus[advancedCpuIndex].clock_min_limits!.min; + } - if ((get_value(LIMITS_INFO) as backend.SettingsLimits).cpu.cpus[advancedCpuIndex].clock_max_limits != null) { - clocks[advancedCpuIndex].max = (get_value(LIMITS_INFO) as backend.SettingsLimits).cpu.cpus[advancedCpuIndex].clock_max_limits!.max; - } - set_value(CLOCK_MIN_MAX_CPU, clocks); - reloadGUI("CPUFreqToggle"); + if ((get_value(LIMITS_INFO) as backend.SettingsLimits).cpu.cpus[advancedCpuIndex].clock_max_limits != null) { + clocks[advancedCpuIndex].max = (get_value(LIMITS_INFO) as backend.SettingsLimits).cpu.cpus[advancedCpuIndex].clock_max_limits!.max; + } + set_value(CLOCK_MIN_MAX_CPU, clocks); + reloadGUI("CPUFreqToggle"); } else { - const clocks = get_value(CLOCK_MIN_MAX_CPU) as MinMax[]; - clocks[advancedCpuIndex].min = null; - clocks[advancedCpuIndex].max = null; - set_value(CLOCK_MIN_MAX_CPU, clocks); - backend.resolve(backend.unsetCpuClockLimits(advancedCpuIndex), (_idc: any[]) => { - reloadGUI("CPUUnsetFreq"); - }); + const clocks = get_value(CLOCK_MIN_MAX_CPU) as MinMax[]; + clocks[advancedCpuIndex].min = null; + clocks[advancedCpuIndex].max = null; + set_value(CLOCK_MIN_MAX_CPU, clocks); + backend.resolve(backend.unsetCpuClockLimits(advancedCpuIndex), (_idc: any[]) => { + reloadGUI("CPUUnsetFreq"); + }); } }} /> diff --git a/src/components/gpu.tsx b/src/components/gpu.tsx index e9569c8..a8fdd52 100644 --- a/src/components/gpu.tsx +++ b/src/components/gpu.tsx @@ -40,20 +40,20 @@ export class Gpu extends Component { description={tr("Override APU TDP settings")} onChange={(value: boolean) => { if (value) { - if ((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.slow_ppt_limits != null) { - set_value(SLOW_PPT_GPU, (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.slow_ppt_limits!.max); - } + if ((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.slow_ppt_limits != null) { + set_value(SLOW_PPT_GPU, (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.slow_ppt_limits!.max); + } - if ((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.fast_ppt_limits != null) { - set_value(FAST_PPT_GPU, (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.fast_ppt_limits!.max); - } - reloadGUI("GPUPPTToggle"); + if ((get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.fast_ppt_limits != null) { + set_value(FAST_PPT_GPU, (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.fast_ppt_limits!.max); + } + reloadGUI("GPUPPTToggle"); } else { - set_value(SLOW_PPT_GPU, null); - set_value(FAST_PPT_GPU, null); - backend.resolve(backend.unsetGpuPpt(), (_: any[]) => { - reloadGUI("GPUUnsetPPT"); - }); + set_value(SLOW_PPT_GPU, null); + set_value(FAST_PPT_GPU, null); + backend.resolve(backend.unsetGpuPpt(), (_: any[]) => { + reloadGUI("GPUUnsetPPT"); + }); } }} /> @@ -113,15 +113,15 @@ export class Gpu extends Component { description={tr("Set bounds on clock speed")} onChange={(value: boolean) => { if (value) { - let clock_min_limits = (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_min_limits; - let clock_max_limits = (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_max_limits; - if (clock_min_limits != null) { - set_value(CLOCK_MIN_GPU, clock_min_limits.min); - } - if (clock_max_limits != null) { - set_value(CLOCK_MAX_GPU, clock_max_limits.max); - } - reloadGUI("GPUFreqToggle"); + let clock_min_limits = (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_min_limits; + let clock_max_limits = (get_value(LIMITS_INFO) as backend.SettingsLimits).gpu.clock_max_limits; + if (clock_min_limits != null) { + set_value(CLOCK_MIN_GPU, clock_min_limits.min); + } + if (clock_max_limits != null) { + set_value(CLOCK_MAX_GPU, clock_max_limits.max); + } + reloadGUI("GPUFreqToggle"); } else { set_value(CLOCK_MIN_GPU, null); set_value(CLOCK_MAX_GPU, null); @@ -187,8 +187,8 @@ export class Gpu extends Component { description={tr("Force RAM into low-power mode")} onChange={(value: boolean) => { backend.resolve(backend.setGpuSlowMemory(value), (val: boolean) => { - set_value(SLOW_MEMORY_GPU, val); - reloadGUI("GPUSlowMemory"); + set_value(SLOW_MEMORY_GPU, val); + reloadGUI("GPUSlowMemory"); }) }} />