diff --git a/core/src/main/kotlin/org/jetbrains/jewel/CommonStateBitMask.kt b/core/src/main/kotlin/org/jetbrains/jewel/CommonStateBitMask.kt index 6406e92c7..36a22f997 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/CommonStateBitMask.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/CommonStateBitMask.kt @@ -1,19 +1,14 @@ package org.jetbrains.jewel internal object CommonStateBitMask { + val Enabled = 1UL shl 0 val Focused = 1UL shl 1 val Hovered = 1UL shl 2 val Pressed = 1UL shl 3 val Active = 1UL shl 4 + val Selected = 1UL shl 5 + val Indeterminate = 1UL shl 6 - @Deprecated("Shouldn't be part of the core state") - val Error = 1UL shl 5 - - @Deprecated("Shouldn't be part of the core state") - val Warning = 1UL shl 6 - val Selected = 1UL shl 7 - val Indeterminate = 1UL shl 8 - - const val FIRST_AVAILABLE_OFFSET = 9 + const val FIRST_AVAILABLE_OFFSET = 7 } diff --git a/core/src/main/kotlin/org/jetbrains/jewel/TabStrip.kt b/core/src/main/kotlin/org/jetbrains/jewel/TabStrip.kt index 4210993d0..43818bd5a 100644 --- a/core/src/main/kotlin/org/jetbrains/jewel/TabStrip.kt +++ b/core/src/main/kotlin/org/jetbrains/jewel/TabStrip.kt @@ -220,18 +220,14 @@ value class TabStripState(val state: ULong) : FocusableComponentState { fun of( enabled: Boolean = true, focused: Boolean = false, - error: Boolean = false, pressed: Boolean = false, hovered: Boolean = false, - warning: Boolean = false, active: Boolean = false, ) = TabStripState( state = (if (enabled) CommonStateBitMask.Enabled else 0UL) or (if (focused) CommonStateBitMask.Focused else 0UL) or (if (hovered) CommonStateBitMask.Hovered else 0UL) or (if (pressed) CommonStateBitMask.Pressed else 0UL) or - (if (warning) CommonStateBitMask.Warning else 0UL) or - (if (error) CommonStateBitMask.Error else 0UL) or (if (active) CommonStateBitMask.Active else 0UL), ) }