diff --git a/core/assets-raw/sprites/ui/scroll-knob-vertical-thin.png b/core/assets-raw/sprites/ui/scroll-knob-vertical-thin.png new file mode 100644 index 0000000000..540a1bcfca Binary files /dev/null and b/core/assets-raw/sprites/ui/scroll-knob-vertical-thin.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 36c66dab43..f45ef1a9b4 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -19199,6 +19199,13 @@ scroll-knob-vertical-black orig: 24, 40 offset: 0, 0 index: -1 +scroll-knob-vertical-thin + rotate: false + xy: 2033, 361 + size: 12, 40 + orig: 12, 40 + offset: 0, 0 + index: -1 selection rotate: false xy: 309, 975 diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index db0bbb8db9..332c95dc4a 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/io/anuke/mindustry/ui/Styles.java b/core/src/io/anuke/mindustry/ui/Styles.java index cd9af651ad..29c1321009 100644 --- a/core/src/io/anuke/mindustry/ui/Styles.java +++ b/core/src/io/anuke/mindustry/ui/Styles.java @@ -27,7 +27,7 @@ public class Styles{ public static ButtonStyle defaultb, waveb; public static TextButtonStyle defaultt, squaret, nodet, cleart, discordt, infot, clearPartialt, clearTogglet, clearToggleMenut, togglet; public static ImageButtonStyle defaulti, nodei, righti, emptyi, emptytogglei, selecti, cleari, clearFulli, clearPartiali, clearPartial2i, clearTogglei, clearTransi, clearToggleTransi, clearTogglePartiali; - public static ScrollPaneStyle defaultPane, horizontalPane; + public static ScrollPaneStyle defaultPane, horizontalPane, smallPane; public static KeybindDialogStyle defaultKeybindDialog; public static SliderStyle defaultSlider, vSlider; public static LabelStyle defaultLabel, outlineLabel; @@ -225,6 +225,10 @@ public class Styles{ hScroll = scrollHorizontal; hScrollKnob = scrollKnobHorizontalBlack; }}; + smallPane = new ScrollPaneStyle(){{ + vScroll = clear; + vScrollKnob = scrollKnobVerticalThin; + }}; defaultKeybindDialog = new KeybindDialogStyle(){{ keyColor = Pal.accent; diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index cd93807065..93ef539a96 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -232,7 +232,7 @@ public class PlacementFragment extends Fragment{ frame.row(); frame.table(Tex.pane2, blocksSelect -> { blocksSelect.margin(4).marginTop(0); - blocksSelect.table(blocks -> blockTable = blocks).grow(); + blocksSelect.pane(blocks -> blockTable = blocks).height(194f).grow().get().setStyle(Styles.smallPane); blocksSelect.row(); blocksSelect.table(control.input::buildPlacementUI).name("inputTable").growX(); }).fillY().bottom().touchable(Touchable.enabled);