Skip to content

Commit 22aee02

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 213c23b + 74ebebd commit 22aee02

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

HardwareMonitor/HardwareMonitor/Monitor/MonitorPoller.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ILogger<MonitorPoller> logger
3434
private readonly PresentMonPoller _presentMonPoller = new(logger);
3535

3636
private short _pollingRate = 500;
37-
private const short MinimalPollingRate = 50;
37+
private const short MinimalPollingRate = 33;
3838

3939
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
4040
{

target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/Settings.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,6 @@ private fun TabContent(
199199
onCustomSensorSelect = { sensorType, sensorId ->
200200
viewModel.onEvent(SettingsEvent.CustomSensorSelect(sensorType, sensorId))
201201
},
202-
onDisplaySelect = {
203-
viewModel.onEvent(SettingsEvent.DisplaySelect(it))
204-
},
205202
onFpsApplicationSelect = {
206203
viewModel.onEvent(SettingsEvent.FpsApplicationSelect(it))
207204
},
@@ -249,6 +246,9 @@ private fun TabContent(
249246
onOpacityChange = { viewModel.onEvent(SettingsEvent.OverlayOpacityChange(it)) },
250247
onGraphTypeChange = { viewModel.onEvent(SettingsEvent.OverlayGraphChange(it)) },
251248
onOverlayCustomPositionEnable = { viewModel.onEvent(SettingsEvent.OverlayCustomPositionEnable(it)) },
249+
onDisplaySelect = {
250+
viewModel.onEvent(SettingsEvent.DisplaySelect(it))
251+
},
252252
)
253253

254254
2 -> AppSettingsUi(overlaySettings = settingsState.overlaySettings!!, onEvent = viewModel::onEvent)

target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/AppSettingsUi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fun AppSettingsUi(
104104
}
105105

106106
Section(title = "RECORDING") {
107-
val options = listOf("50", "100", "250", "300", "350", "400", "500")
107+
val options = listOf("33", "50", "100", "250", "300", "350", "400", "500")
108108
DropdownMenu(
109109
label = "Polling Rate:",
110110
disclaimer = "The interval in milliseconds the app will update data. Be mindful, this can impact performance!",

target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/stats/StatsUi.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ fun StatsUi(
3232
onOptionsToggle: (CheckboxSectionOption) -> Unit,
3333
onSectionSwitchToggle: (SectionType, Boolean) -> Unit,
3434
onCustomSensorSelect: (SensorType, String) -> Unit,
35-
onDisplaySelect: (Int) -> Unit,
3635
onFpsApplicationSelect: (String) -> Unit,
3736
getCpuSensorReadings: () -> List<HardwareMonitorData.Sensor>,
3837
getGpuSensorReadings: () -> List<HardwareMonitorData.Sensor>,
@@ -45,7 +44,6 @@ fun StatsUi(
4544
modifier = Modifier.padding(bottom = 8.dp, top = 20.dp).verticalScroll(rememberScrollState()),
4645
verticalArrangement = Arrangement.spacedBy(16.dp)
4746
) {
48-
val screenDevices = remember { GraphicsEnvironment.getLocalGraphicsEnvironment().screenDevices }
4947
val availableOptions = remember(overlaySettings) { checkboxSectionOptions(overlaySettings) }
5048

5149
KeyboardShortcutInfoLabel()
@@ -93,13 +91,6 @@ fun StatsUi(
9391
getHardwareSensors = getHardwareSensors,
9492
)
9593

96-
DropdownSection(
97-
title = "MONITOR",
98-
options = screenDevices.map { it.defaultConfiguration.device.iDstring },
99-
selectedIndex = overlaySettings.selectedDisplayIndex,
100-
onValueChanged = { onDisplaySelect(it) }
101-
)
102-
10394
Text(
10495
text = "May your frames be high, and temps be low.",
10596
color = LocalColorScheme.current.text.disabled,

target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/StyleUi.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ import androidx.compose.foundation.layout.padding
66
import androidx.compose.foundation.rememberScrollState
77
import androidx.compose.foundation.verticalScroll
88
import androidx.compose.runtime.Composable
9+
import androidx.compose.runtime.remember
910
import androidx.compose.ui.Modifier
1011
import androidx.compose.ui.unit.IntOffset
1112
import androidx.compose.ui.unit.dp
1213
import app.cleanmeter.target.desktop.model.OverlaySettings
14+
import app.cleanmeter.target.desktop.ui.components.section.DropdownSection
15+
import java.awt.GraphicsEnvironment
1316

1417
@Composable
1518
fun StyleUi(
@@ -20,11 +23,14 @@ fun StyleUi(
2023
onOpacityChange: (Float) -> Unit,
2124
onGraphTypeChange: (OverlaySettings.ProgressType) -> Unit,
2225
onOverlayCustomPositionEnable: (Boolean) -> Unit,
26+
onDisplaySelect: (Int) -> Unit,
2327
getOverlayPosition: () -> IntOffset,
2428
) = Column(
2529
modifier = Modifier.padding(bottom = 8.dp, top = 20.dp).verticalScroll(rememberScrollState()),
2630
verticalArrangement = Arrangement.spacedBy(16.dp)
2731
) {
32+
val screenDevices = remember { GraphicsEnvironment.getLocalGraphicsEnvironment().screenDevices }
33+
2834
Position(
2935
overlaySettings = overlaySettings,
3036
onOverlayPositionIndex = onOverlayPositionIndex,
@@ -47,4 +53,11 @@ fun StyleUi(
4753
overlaySettings = overlaySettings,
4854
onGraphTypeChange = onGraphTypeChange
4955
)
56+
57+
DropdownSection(
58+
title = "MONITOR",
59+
options = screenDevices.map { it.defaultConfiguration.device.iDstring },
60+
selectedIndex = overlaySettings.selectedDisplayIndex,
61+
onValueChanged = { onDisplaySelect(it) }
62+
)
5063
}

0 commit comments

Comments
 (0)