Skip to content

Commit 4e63c1c

Browse files
committed
#1986 fix: trigger screen is usable on slightly rectangular screens with a low DPI
1 parent 0f04175 commit 4e63c1c

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
## Fixed
1212

13+
- #1986 fix: trigger screen is usable on slightly rectangular screens with a low DPI
1314
- Bugs with expert mode auto starting time.
1415

1516
## [4.0.0 Beta 6](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.06)

base/src/main/java/io/github/sds100/keymapper/base/trigger/BaseTriggerScreen.kt

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import androidx.compose.material3.CircularProgressIndicator
2121
import androidx.compose.material3.ExperimentalMaterial3Api
2222
import androidx.compose.material3.Icon
2323
import androidx.compose.material3.Surface
24+
import androidx.compose.material3.Text
2425
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
2526
import androidx.compose.material3.rememberModalBottomSheetState
2627
import androidx.compose.runtime.Composable
@@ -183,7 +184,8 @@ fun BaseTriggerScreen(
183184
private fun isHorizontalLayout(): Boolean {
184185
val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
185186

186-
return windowSizeClass.windowHeightSizeClass == WindowHeightSizeClass.COMPACT
187+
return windowSizeClass.windowHeightSizeClass == WindowHeightSizeClass.COMPACT &&
188+
windowSizeClass.isWidthAtLeastBreakpoint(600)
187189
}
188190

189191
@Composable
@@ -657,6 +659,30 @@ private fun VerticalPreviewTiny() {
657659
}
658660
}
659661

662+
// This preview is slightly rectangular
663+
@Preview(heightDp = 500, widthDp = 530)
664+
@Composable
665+
private fun PreviewSquareRectangle() {
666+
KeyMapperTheme {
667+
if (isHorizontalLayout()) {
668+
Text("MUST BE VERTICAL LAYOUT!")
669+
} else {
670+
TriggerScreenVertical(
671+
configState = previewState,
672+
recordTriggerState = RecordTriggerState.Idle,
673+
expertModeSwitchState = ExpertModeRecordSwitchState(
674+
isVisible = true,
675+
isChecked = true,
676+
isEnabled = true,
677+
),
678+
discoverScreenContent = {
679+
TriggerDiscoverScreen()
680+
},
681+
)
682+
}
683+
}
684+
}
685+
660686
@Preview(device = Devices.PIXEL)
661687
@Composable
662688
private fun VerticalEmptyPreview() {

0 commit comments

Comments
 (0)