Skip to content

Commit 0f6b182

Browse files
Move render controls into left panel and improve buttons (#1025)
1 parent 9ce9487 commit 0f6b182

1 file changed

Lines changed: 44 additions & 29 deletions

File tree

chunky/src/res/se/llbit/chunky/ui/Chunky.fxml

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,29 @@
5656
<SplitPane fx:id="splitPane"
5757
VBox.vgrow="ALWAYS"
5858
maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
59-
<ToolPane fx:id="renderControls" prefWidth="350" />
59+
<VBox>
60+
<ToolPane fx:id="renderControls" prefWidth="350" VBox.vgrow="ALWAYS" />
61+
<Separator/>
62+
<VBox spacing="5.0">
63+
<padding>
64+
<Insets top="2.0" bottom="4.0" left="10.0" right="10.0" />
65+
</padding>
66+
<HBox alignment="CENTER_LEFT" spacing="10.0" >
67+
<Label text="Render:" />
68+
<ToggleButton fx:id="start" mnemonicParsing="false" text="Start">
69+
<toggleGroup>
70+
<ToggleGroup fx:id="renderControl" />
71+
</toggleGroup>
72+
</ToggleButton>
73+
<ToggleButton fx:id="pause" mnemonicParsing="false" text="Pause" toggleGroup="$renderControl" />
74+
<ToggleButton fx:id="reset" mnemonicParsing="false" text="Reset" toggleGroup="$renderControl" selected="true" />
75+
</HBox>
76+
<HBox alignment="CENTER_LEFT" spacing="10.0">
77+
<IntegerAdjuster fx:id="targetSpp" />
78+
<Button fx:id="saveDefaultSpp" mnemonicParsing="false" text="Set default" />
79+
</HBox>
80+
</VBox>
81+
</VBox>
6082
<TabPane fx:id="mainTabs" maxWidth="1.7976931348623157E308" maxHeight="1.7976931348623157E308" tabClosingPolicy="UNAVAILABLE">
6183
<Tab fx:id="worldMapTab" text="Map">
6284
<StackPane fx:id="mapPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="150.0" prefWidth="200.0">
@@ -172,33 +194,26 @@
172194
</Tab>
173195
</TabPane>
174196
</SplitPane>
175-
<HBox alignment="CENTER_LEFT" spacing="10.0">
176-
<Label text="Render:" />
177-
<ToggleButton fx:id="start">
178-
<toggleGroup>
179-
<ToggleGroup fx:id="renderControl" />
180-
</toggleGroup>
181-
</ToggleButton>
182-
<ToggleButton fx:id="pause" toggleGroup="$renderControl" />
183-
<ToggleButton fx:id="reset" mnemonicParsing="false" selected="true" text="Reset" toggleGroup="$renderControl" />
184-
<IntegerAdjuster fx:id="targetSpp" />
185-
<Button fx:id="saveDefaultSpp" mnemonicParsing="false" text="Set default" />
186-
</HBox>
187-
<BorderPane>
188-
<left>
189-
<Label fx:id="renderTimeLbl" text="Render time: 0" />
190-
</left>
191-
<right>
192-
<Label fx:id="sppLbl" text="0 SPP, 0 SPS" />
193-
</right>
194-
</BorderPane>
195-
<BorderPane>
196-
<left>
197-
<Label fx:id="progressLbl" text="Progress" />
198-
</left>
199-
<right>
200-
<Label fx:id="etaLbl" text="ETA: N/A" />
201-
</right>
202-
</BorderPane>
197+
<VBox spacing="5.0">
198+
<padding>
199+
<Insets top="5.0" bottom="5.0" left="10.0" right="10.0" />
200+
</padding>
201+
<BorderPane>
202+
<left>
203+
<Label fx:id="renderTimeLbl" text="Render time: 0" />
204+
</left>
205+
<right>
206+
<Label fx:id="sppLbl" text="0 SPP, 0 SPS" />
207+
</right>
208+
</BorderPane>
209+
<BorderPane>
210+
<left>
211+
<Label fx:id="progressLbl" text="Progress" />
212+
</left>
213+
<right>
214+
<Label fx:id="etaLbl" text="ETA: N/A" />
215+
</right>
216+
</BorderPane>
217+
</VBox>
203218
<ProgressBar fx:id="progressBar" maxWidth="1.7976931348623157E308" minHeight="20" prefHeight="20" progress="0.0" />
204219
</VBox>

0 commit comments

Comments
 (0)