diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt index f8b1ff624..feb1cc6ce 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SkinElement.kt @@ -230,12 +230,7 @@ val left_window_border = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 4f, w = val right_window_border = SkinElement(RenderHelper.WIDGETS, x = 27f, y = 3f, w = 3f, h = 5f) val top_window_border = SkinElement(RenderHelper.WIDGETS, x = 22f, y = 0f, w = 5f, h = 3f) val window_background = SkinElement(RenderHelper.WIDGETS, x = 30f, y = 12f, w = 6f, h = 6f) -val scroll_bar_top = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 57f, w = 14f, h = 2f) -val scroll_bar_bottom = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 63f, w = 14f, h = 2f) -val scroll_bar_body = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 58f, w = 14f, h = 6f) -val scroll_bar_button = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 12f, w = 12f, h = 15f) -val scroll_bar_button_hover = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 27f, w = 12f, h = 15f) -val scroll_bar_button_press = SkinElement(RenderHelper.WIDGETS, x = 18f, y = 42f, w = 12f, h = 15f) + val tab_right_connection = SkinElement(RenderHelper.WIDGETS, x = 30f, y = 0f, w = 3f, h = 5f) val tab_left_connection = SkinElement(RenderHelper.WIDGETS, x = 33f, y = 0f, w = 3f, h = 5f) val tab_background = SkinElement(RenderHelper.WIDGETS, x = 30f, y = 6f, w = 6f, h = 6f) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.kt index 2a6298a66..41416d91b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ScrollBarPanel.kt @@ -139,5 +139,13 @@ open class ScrollBarPanel(screen: MatteryScreen<*>, parent: EditablePanel?, x: F companion object { const val WIDTH = 14f + + val scroll_bar_top = RenderHelper.SCROLL.element(0f, 45f, 14f, 2f, 14f, 53f) + val scroll_bar_body = RenderHelper.SCROLL.element(0f, 46f, 14f, 6f, 14f, 53f) + val scroll_bar_bottom = RenderHelper.SCROLL.element(0f, 51f, 14f, 2f, 14f, 53f) + + val scroll_bar_button = RenderHelper.SCROLL.element(0f, 0f, 12f, 15f, 14f, 53f) + val scroll_bar_button_hover = RenderHelper.SCROLL.element(0f, 15f, 12f, 15f, 14f, 53f) + val scroll_bar_button_press = RenderHelper.SCROLL.element(0f, 30f, 12f, 15f, 14f, 53f) } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.png new file mode 100644 index 000000000..619aabceb Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.xcf new file mode 100644 index 000000000..d22f2d408 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/gui/scroll.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e616c18b1a07c8d4147d351c51a0f50f51ba67c38acc6f88f3f286a7465a9a3d +size 2426 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.png index 86ed9c540..18d0611f3 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.png and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf index 515415ca1..2c1e1ad14 100644 --- a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf +++ b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:289e6665dcc783a0b712a41470d3ae4a41e65a0e2b8c643f995415258cecdce8 -size 29982 +oid sha256:38fa3dd76b920593331a25e47779cee7a1d3716b57881c3082c7e9f85f16482c +size 45416 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.png new file mode 100644 index 000000000..faa5401c5 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.xcf new file mode 100644 index 000000000..8560acec9 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_18.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:885634ee3f045085e561d15fd54e7d8a9ef422090c394f5db4066b2ba9d720ec +size 6123 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.png new file mode 100644 index 000000000..900cfef3a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.xcf new file mode 100644 index 000000000..42b5542d6 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets_8.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7b8699adea98971280f5a2d155b33fbf59684188b14ed86944b3fbba592c89f +size 2220