Skip to content

fix(hud): use window bounds for action bar #965

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

Merged
Wyvest merged 2 commits into from
Aug 16, 2026
Merged

fix(hud): use window bounds for action bar #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b0f891
fix(hud): use window bounds for action bar
saadndm Aug 13, 2026
b94112c
Rename HudEditorViewport to reflect actual usage
Wyvest Aug 16, 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
2 changes: 1 addition & 1 deletion ...ft/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/compose/impls/HudEditorUIScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class HudEditorUIScreen : ComposeScreen() {
HudManager.guiScreenHeight = sh
HudManager.prepare(sw, sh)
}
HudEditorViewport.update(Platform.screen().viewportWidth(), Platform.screen().viewportHeight())
HudEditorViewport.update(Platform.screen().windowWidth(), Platform.screen().windowHeight())
//~ if >= 26.1 'render' -> 'extractRenderState'
super.extractRenderState(ctx, mouseX, mouseY, tickDelta)
}
Expand Down
2 changes: 1 addition & 1 deletion ...ft/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/compose/impls/OneConfigUIScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class OneConfigUIScreen @JvmOverloads constructor(
HudManager.guiScreenHeight = sh
HudManager.prepare(sw, sh)
}
HudEditorViewport.update(Platform.screen().viewportWidth(), Platform.screen().viewportHeight())
HudEditorViewport.update(Platform.screen().windowWidth(), Platform.screen().windowHeight())
if (OneConfigConfig.enableBackgroundBlur) {
//? if >= 1.21.10 {
if (SkiaCtx.isDeferredComposeBackend) {
Expand Down
20 changes: 10 additions & 10 deletions ...ternal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/hud/screens/HudDesignStudio.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,22 @@ enum class StudioCategory(val title: String, val icon: String) {
}

object HudEditorViewport {
var viewportWidth by mutableStateOf(0)
var screenWidth by mutableStateOf(0)
private set
var viewportHeight by mutableStateOf(0)
var screenHeight by mutableStateOf(0)
private set

fun update(width: Int, height: Int) {
if (width == viewportWidth && height == viewportHeight) return
if (width == screenWidth && height == screenHeight) return
Snapshot.withMutableSnapshot {
viewportWidth = width
viewportHeight = height
screenWidth = width
screenHeight = height
}
}

fun observe() {
@Suppress("UNUSED_EXPRESSION") viewportWidth
@Suppress("UNUSED_EXPRESSION") viewportHeight
@Suppress("UNUSED_EXPRESSION") screenWidth
@Suppress("UNUSED_EXPRESSION") screenHeight
}
}

Expand Down Expand Up @@ -489,9 +489,9 @@ private fun hudActionBarLayout(

// the bar lives outside the HUD box because small HUDs swallow or overlap the icons when the
// buttons are laid out inside the bounds
val screenW = HudEditorViewport.viewportWidth.toFloat()
val screenW = HudEditorViewport.screenWidth.toFloat()
.takeIf { it > 0f } ?: (HudManager.guiScreenWidth * mcToScreen)
val screenH = HudEditorViewport.viewportHeight.toFloat()
val screenH = HudEditorViewport.screenHeight.toFloat()
.takeIf { it > 0f } ?: (HudManager.guiScreenHeight * mcToScreen)

val padPx = actionBarPadding(gapPx)
Expand Down Expand Up @@ -972,7 +972,7 @@ fun HudDesignStudio(onReturnToOneConfig: (() -> Unit)? = null) {
HudManager.pendingSelection = null
HudManager.pendingAdd = null
if (pendingAdd != null) {
snapshotFlow { HudEditorViewport.viewportWidth }.first { it > 0 }
snapshotFlow { HudEditorViewport.screenWidth }.first { it > 0 }
val instance = placeHudCentered(pendingAdd)
if (instance != null) {
Snapshot.withMutableSnapshot {
Expand Down
Loading