DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Rename scrollbar skin elements constants

Browse Source
This commit is contained in:
DBotThePony 2022-09-29 13:20:02 +07:00
parent e6fa7208d9
commit 3abee0421b
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AnalogScrollBarPanel.kt
View File

@ -26,23 +26,23 @@ open class AnalogScrollBarPanel<out S : Screen>(
override fun innerRender(stack: PoseStack, mouseX: Float, mouseY: Float, partialTick: Float) { override fun innerRender(stack: PoseStack, mouseX: Float, mouseY: Float, partialTick: Float) {
if (this@AnalogScrollBarPanel.width == ScrollBarConstants.SLIM_WIDTH) { if (this@AnalogScrollBarPanel.width == ScrollBarConstants.SLIM_WIDTH) {
if (isScrolling) { if (isScrolling) {
ScrollBarConstants.scrollSlimBarButtonPress.render(stack, width = width, height = height) ScrollBarConstants.SLIM_BUTTON_PRESS.render(stack, width = width, height = height)
} else if (maxScroll.invoke(this@AnalogScrollBarPanel) <= 0) { } else if (maxScroll.invoke(this@AnalogScrollBarPanel) <= 0) {
ScrollBarConstants.scrollSlimBarButtonDisabled.render(stack, width = width, height = height) ScrollBarConstants.SLIM_BUTTON_DISABLED.render(stack, width = width, height = height)
} else if (isHovered) { } else if (isHovered) {
ScrollBarConstants.scrollSlimBarButtonHover.render(stack, width = width, height = height) ScrollBarConstants.SLIM_BUTTON_HOVER.render(stack, width = width, height = height)
} else { } else {
ScrollBarConstants.scrollSlimBarButton.render(stack, width = width, height = height) ScrollBarConstants.SLIM_BUTTON.render(stack, width = width, height = height)
} }
} else { } else {
if (isScrolling) { if (isScrolling) {
ScrollBarConstants.scrollBarButtonPress.render(stack, width = width, height = height) ScrollBarConstants.BUTTON_PRESS.render(stack, width = width, height = height)
} else if (maxScroll.invoke(this@AnalogScrollBarPanel) <= 0) { } else if (maxScroll.invoke(this@AnalogScrollBarPanel) <= 0) {
ScrollBarConstants.scrollBarButtonDisabled.render(stack, width = width, height = height) ScrollBarConstants.BUTTON_DISABLED.render(stack, width = width, height = height)
} else if (isHovered) { } else if (isHovered) {
ScrollBarConstants.scrollBarButtonHover.render(stack, width = width, height = height) ScrollBarConstants.BUTTON_HOVER.render(stack, width = width, height = height)
} else { } else {
ScrollBarConstants.scrollBarButton.render(stack, width = width, height = height) ScrollBarConstants.BUTTON.render(stack, width = width, height = height)
} }
} }
} }
@ -97,13 +97,13 @@ open class AnalogScrollBarPanel<out S : Screen>(
override fun innerRender(stack: PoseStack, mouseX: Float, mouseY: Float, partialTick: Float) { override fun innerRender(stack: PoseStack, mouseX: Float, mouseY: Float, partialTick: Float) {
if (width == ScrollBarConstants.SLIM_WIDTH) { if (width == ScrollBarConstants.SLIM_WIDTH) {
ScrollBarConstants.scrollSlimBarBody.render(stack, y = 2f, height = height - 4f) ScrollBarConstants.SLIM_BODY.render(stack, y = 2f, height = height - 4f)
ScrollBarConstants.scrollSlimBarTop.render(stack) ScrollBarConstants.SLIM_TOP.render(stack)
ScrollBarConstants.scrollSlimBarBottom.render(stack, y = height - 2f) ScrollBarConstants.SLIM_BOTTOM.render(stack, y = height - 2f)
} else { } else {
ScrollBarConstants.scrollBarBody.render(stack, y = 2f, height = height - 4f) ScrollBarConstants.BODY.render(stack, y = 2f, height = height - 4f)
ScrollBarConstants.scrollBarTop.render(stack) ScrollBarConstants.TOP.render(stack)
ScrollBarConstants.scrollBarBottom.render(stack, y = height - 2f) ScrollBarConstants.BOTTOM.render(stack, y = height - 2f)
} }
val time = System.nanoTime() val time = System.nanoTime()

28
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DiscreteScrollBarPanel.kt
View File

@ -22,23 +22,23 @@ open class DiscreteScrollBarPanel<out S : Screen>(
override fun innerRender(stack: PoseStack, mouseX: Float, mouseY: Float, partialTick: Float) { override fun innerRender(stack: PoseStack, mouseX: Float, mouseY: Float, partialTick: Float) {
if (this@DiscreteScrollBarPanel.width == ScrollBarConstants.SLIM_WIDTH) { if (this@DiscreteScrollBarPanel.width == ScrollBarConstants.SLIM_WIDTH) {
if (isScrolling) { if (isScrolling) {
ScrollBarConstants.scrollSlimBarButtonPress.render(stack, width = width, height = height) ScrollBarConstants.SLIM_BUTTON_PRESS.render(stack, width = width, height = height)
} else if (maxScroll.invoke(this@DiscreteScrollBarPanel) <= 0) { } else if (maxScroll.invoke(this@DiscreteScrollBarPanel) <= 0) {
ScrollBarConstants.scrollSlimBarButtonDisabled.render(stack, width = width, height = height) ScrollBarConstants.SLIM_BUTTON_DISABLED.render(stack, width = width, height = height)
} else if (isHovered) { } else if (isHovered) {
ScrollBarConstants.scrollSlimBarButtonHover.render(stack, width = width, height = height) ScrollBarConstants.SLIM_BUTTON_HOVER.render(stack, width = width, height = height)
} else { } else {
ScrollBarConstants.scrollSlimBarButton.render(stack, width = width, height = height) ScrollBarConstants.SLIM_BUTTON.render(stack, width = width, height = height)
} }
} else { } else {
if (isScrolling) { if (isScrolling) {
ScrollBarConstants.scrollBarButtonPress.render(stack, width = width, height = height) ScrollBarConstants.BUTTON_PRESS.render(stack, width = width, height = height)
} else if (maxScroll.invoke(this@DiscreteScrollBarPanel) <= 0) { } else if (maxScroll.invoke(this@DiscreteScrollBarPanel) <= 0) {
ScrollBarConstants.scrollBarButtonDisabled.render(stack, width = width, height = height) ScrollBarConstants.BUTTON_DISABLED.render(stack, width = width, height = height)
} else if (isHovered) { } else if (isHovered) {
ScrollBarConstants.scrollBarButtonHover.render(stack, width = width, height = height) ScrollBarConstants.BUTTON_HOVER.render(stack, width = width, height = height)
} else { } else {
ScrollBarConstants.scrollBarButton.render(stack, width = width, height = height) ScrollBarConstants.BUTTON.render(stack, width = width, height = height)
} }
} }
} }
@ -91,13 +91,13 @@ open class DiscreteScrollBarPanel<out S : Screen>(
override fun innerRender(stack: PoseStack, mouseX: Float, mouseY: Float, partialTick: Float) { override fun innerRender(stack: PoseStack, mouseX: Float, mouseY: Float, partialTick: Float) {
if (width == ScrollBarConstants.SLIM_WIDTH) { if (width == ScrollBarConstants.SLIM_WIDTH) {
ScrollBarConstants.scrollSlimBarBody.render(stack, y = 2f, height = height - 4f) ScrollBarConstants.SLIM_BODY.render(stack, y = 2f, height = height - 4f)
ScrollBarConstants.scrollSlimBarTop.render(stack) ScrollBarConstants.SLIM_TOP.render(stack)
ScrollBarConstants.scrollSlimBarBottom.render(stack, y = height - 2f) ScrollBarConstants.SLIM_BOTTOM.render(stack, y = height - 2f)
} else { } else {
ScrollBarConstants.scrollBarBody.render(stack, y = 2f, height = height - 4f) ScrollBarConstants.BODY.render(stack, y = 2f, height = height - 4f)
ScrollBarConstants.scrollBarTop.render(stack) ScrollBarConstants.TOP.render(stack)
ScrollBarConstants.scrollBarBottom.render(stack, y = height - 2f) ScrollBarConstants.BOTTOM.render(stack, y = height - 2f)
} }
} }

28
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarConstants.kt
View File

@ -9,21 +9,21 @@ object ScrollBarConstants {
const val TEXTURE_WIDTH = 22f const val TEXTURE_WIDTH = 22f
const val TEXTURE_HEIGHT = 68f const val TEXTURE_HEIGHT = 68f
val scrollBarTop = WidgetLocation.SCROLL.element(0f, 45f, 14f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val TOP = WidgetLocation.SCROLL.element(0f, 45f, 14f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollBarBody = WidgetLocation.SCROLL.element(0f, 46f, 14f, 6f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val BODY = WidgetLocation.SCROLL.element(0f, 46f, 14f, 6f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollBarBottom = WidgetLocation.SCROLL.element(0f, 51f, 14f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val BOTTOM = WidgetLocation.SCROLL.element(0f, 51f, 14f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollBarButton = WidgetLocation.SCROLL.element(0f, 0f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val BUTTON = WidgetLocation.SCROLL.element(0f, 0f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollBarButtonHover = WidgetLocation.SCROLL.element(0f, 15f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val BUTTON_HOVER = WidgetLocation.SCROLL.element(0f, 15f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollBarButtonPress = WidgetLocation.SCROLL.element(0f, 30f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val BUTTON_PRESS = WidgetLocation.SCROLL.element(0f, 30f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollBarButtonDisabled = WidgetLocation.SCROLL.element(0f, 53f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val BUTTON_DISABLED = WidgetLocation.SCROLL.element(0f, 53f, 12f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollSlimBarTop = WidgetLocation.SCROLL.element(14f, 45f, 8f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_TOP = WidgetLocation.SCROLL.element(14f, 45f, 8f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollSlimBarBody = WidgetLocation.SCROLL.element(14f, 46f, 8f, 6f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_BODY = WidgetLocation.SCROLL.element(14f, 46f, 8f, 6f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollSlimBarBottom = WidgetLocation.SCROLL.element(14f, 51f, 8f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_BOTTOM = WidgetLocation.SCROLL.element(14f, 51f, 8f, 2f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollSlimBarButton = WidgetLocation.SCROLL.element(14f, 0f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_BUTTON = WidgetLocation.SCROLL.element(14f, 0f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollSlimBarButtonHover = WidgetLocation.SCROLL.element(14f, 15f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_BUTTON_HOVER = WidgetLocation.SCROLL.element(14f, 15f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollSlimBarButtonPress = WidgetLocation.SCROLL.element(14f, 30f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_BUTTON_PRESS = WidgetLocation.SCROLL.element(14f, 30f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
val scrollSlimBarButtonDisabled = WidgetLocation.SCROLL.element(14f, 53f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT) val SLIM_BUTTON_DISABLED = WidgetLocation.SCROLL.element(14f, 53f, 6f, 15f, TEXTURE_WIDTH, TEXTURE_HEIGHT)
} }