Skip to content

Commit f2a0a5c

Browse files
committed
Proper types for layout objects and tooltip config
1 parent b9b17b7 commit f2a0a5c

28 files changed

+255
-244
lines changed

src/main/kotlin/com/lambda/config/settings/CharSetting.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ class CharSetting(
4343
description,
4444
visibility
4545
) {
46-
override fun invoke(p1: ImGuiBuilder) {}
46+
override fun ImGuiBuilder.buildLayout() {
47+
48+
}
4749

4850
override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
4951
required(word(name)) { parameter ->

src/main/kotlin/com/lambda/config/settings/FunctionSetting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ open class FunctionSetting<T>(
3434
description,
3535
visibility
3636
) {
37-
override fun invoke(p1: ImGuiBuilder) = with(p1) {
37+
override fun ImGuiBuilder.buildLayout() {
3838
button(name) { value() }
3939
lambdaTooltip(description)
4040
}

src/main/kotlin/com/lambda/config/settings/NumericSetting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ abstract class NumericSetting<T>(
5757
*/
5858
protected abstract fun ImGuiBuilder.buildSlider()
5959

60-
override fun invoke(p1: ImGuiBuilder) = with(p1) {
60+
override fun ImGuiBuilder.buildLayout() {
6161
val showReset = isModified
6262
val resetButtonText = "R"
6363
val valueString = this@NumericSetting.toString()

src/main/kotlin/com/lambda/config/settings/StringSetting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class StringSetting(
4444
description,
4545
visibility
4646
) {
47-
override fun invoke(p1: ImGuiBuilder) = with(p1) {
47+
override fun ImGuiBuilder.buildLayout() {
4848
if (multiline) {
4949
inputTextMultiline(name, ::value, flags = flags)
5050
} else {

src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ListSetting<T : Any>(
4444
private val strListType =
4545
TypeToken.getParameterized(MutableList::class.java, String::class.java).type
4646

47-
override fun invoke(p1: ImGuiBuilder) = with(p1) {
47+
override fun ImGuiBuilder.buildLayout() {
4848
combo("##$name", "$name: ${value.size} item(s)") {
4949
immutableList
5050
.forEach {

src/main/kotlin/com/lambda/config/settings/collections/MapSetting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ class MapSetting<K, V>(
3636
description,
3737
visibility
3838
) {
39-
override fun invoke(p1: ImGuiBuilder) = with(p1) {}
39+
override fun ImGuiBuilder.buildLayout() {}
4040
}

src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class SetSetting<T : Any>(
4444
private val strSetType =
4545
TypeToken.getParameterized(Set::class.java, String::class.java).type
4646

47-
override fun invoke(p1: ImGuiBuilder) = with(p1) {
47+
override fun ImGuiBuilder.buildLayout() {
4848
combo("##$name", "$name: ${value.size} item(s)") {
4949
immutableSet
5050
.forEach {

src/main/kotlin/com/lambda/config/settings/comparable/BooleanSetting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class BooleanSetting(
4141
description,
4242
visibility
4343
) {
44-
override fun invoke(p1: ImGuiBuilder) = with(p1) {
44+
override fun ImGuiBuilder.buildLayout() {
4545
checkbox(name, ::value)
4646
lambdaTooltip(description)
4747
}

src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class EnumSetting<T : Enum<T>>(
5151
value = value.enumValues[to % value.enumValues.size]
5252
}
5353

54-
override fun invoke(p1: ImGuiBuilder) = with(p1) {
54+
override fun ImGuiBuilder.buildLayout() {
5555
val values = value.enumValues
5656
val currentDisplay = value.displayValue
5757

src/main/kotlin/com/lambda/config/settings/complex/BlockPosSetting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class BlockPosSetting(
4343
description,
4444
visibility
4545
) {
46-
override fun invoke(p1: ImGuiBuilder) = with(p1) {
46+
override fun ImGuiBuilder.buildLayout() {
4747
inputVec3i(name, value) { value = it.blockPos }
4848
lambdaTooltip(description)
4949
}

0 commit comments

Comments
 (0)