mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-13 01:07:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

Layout fixes

Browse Source
This commit is contained in:
Anuken
2019-10-27 16:26:33 -04:00
parent d28ae1b304
commit ef2817513a
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/ui/scroll-knob-vertical-thin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

7
core/assets/sprites/sprites.atlas
View File

@ -19199,6 +19199,13 @@ scroll-knob-vertical-black
orig: 24, 40 orig: 24, 40
offset: 0, 0 offset: 0, 0
index: -1 index: -1
scroll-knob-vertical-thin
rotate: false
xy: 2033, 361
size: 12, 40
orig: 12, 40
offset: 0, 0
index: -1
selection selection
rotate: false rotate: false
xy: 309, 975 xy: 309, 975

BIN
core/assets/sprites/sprites5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 882 KiB

After

Width:  |  Height:  |  Size: 882 KiB

6
core/src/io/anuke/mindustry/ui/Styles.java
View File

@ -27,7 +27,7 @@ public class Styles{
public static ButtonStyle defaultb, waveb; public static ButtonStyle defaultb, waveb;
public static TextButtonStyle defaultt, squaret, nodet, cleart, discordt, infot, clearPartialt, clearTogglet, clearToggleMenut, togglet; 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 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 KeybindDialogStyle defaultKeybindDialog;
public static SliderStyle defaultSlider, vSlider; public static SliderStyle defaultSlider, vSlider;
public static LabelStyle defaultLabel, outlineLabel; public static LabelStyle defaultLabel, outlineLabel;
@ -225,6 +225,10 @@ public class Styles{
hScroll = scrollHorizontal; hScroll = scrollHorizontal;
hScrollKnob = scrollKnobHorizontalBlack; hScrollKnob = scrollKnobHorizontalBlack;
}}; }};
smallPane = new ScrollPaneStyle(){{
vScroll = clear;
vScrollKnob = scrollKnobVerticalThin;
}};
defaultKeybindDialog = new KeybindDialogStyle(){{ defaultKeybindDialog = new KeybindDialogStyle(){{
keyColor = Pal.accent; keyColor = Pal.accent;

2
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@ -232,7 +232,7 @@ public class PlacementFragment extends Fragment{
frame.row(); frame.row();
frame.table(Tex.pane2, blocksSelect -> { frame.table(Tex.pane2, blocksSelect -> {
blocksSelect.margin(4).marginTop(0); 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.row();
blocksSelect.table(control.input::buildPlacementUI).name("inputTable").growX(); blocksSelect.table(control.input::buildPlacementUI).name("inputTable").growX();
}).fillY().bottom().touchable(Touchable.enabled); }).fillY().bottom().touchable(Touchable.enabled);