Unwrap TableView in TagsTableLayout and change column proportions

Nianna · Oct 11, 2024 · 3ad07fe · 3ad07fe
1 parent f923e16
commit 3ad07fe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 34 deletions.
diff --git a/src/main/java/com/github/nianna/karedi/controller/TagsTableController.java b/src/main/java/com/github/nianna/karedi/controller/TagsTableController.java
@@ -38,7 +38,6 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
 import javafx.scene.input.TransferMode;
-import javafx.scene.layout.AnchorPane;
 import javafx.util.Callback;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.Validator;
@@ -50,8 +49,6 @@
 import java.util.function.Function;
 
 public class TagsTableController implements Controller {
-    @FXML
-    private AnchorPane pane;
 
     @FXML
     private TableView<Tag> table;
@@ -103,7 +100,7 @@ public void setAppContext(AppContext appContext) {
 
     @Override
     public Node getContent() {
-        return pane;
+        return table;
     }
 
     @FXML

diff --git a/src/main/resources/fxml/TagsTableLayout.fxml b/src/main/resources/fxml/TagsTableLayout.fxml
@@ -4,34 +4,26 @@
 <?import javafx.scene.control.MenuItem?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
-<?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane fx:id="pane" xmlns="http://javafx.com/javafx/8.0.60"
-	xmlns:fx="http://javafx.com/fxml/1"
-	fx:controller="com.github.nianna.karedi.controller.TagsTableController">
-	<children>
-		<TableView fx:id="table" disable="true" editable="true"
-			onMouseClicked="#onTableMouseClicked" AnchorPane.bottomAnchor="0.0"
-			AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
-			AnchorPane.topAnchor="0.0" onKeyPressed="#onKeyPressed">
-			<columns>
-				<TableColumn fx:id="keyColumn" onEditStart="#onKeyColumnEditStart"
-					sortable="false" text="%common.tag_key" />
-				<TableColumn fx:id="valueColumn" onEditCancel="#onValueColumnEditCancel"
-					onEditCommit="#onValueColumnEditCommit" onEditStart="#onValueColumnEditStart"
-					sortable="false" text="%common.tag_value" />
-			</columns>
-			<columnResizePolicy>
-				<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-			</columnResizePolicy>
-			<contextMenu>
-				<ContextMenu fx:id="baseContextMenu">
-					<items>
-						<MenuItem mnemonicParsing="false" onAction="#handleAdd"
-							text="%common.add" />
-					</items>
-				</ContextMenu>
-			</contextMenu>
-		</TableView>
-	</children>
-</AnchorPane>
+<TableView fx:id="table" disable="true" editable="true"
+           onMouseClicked="#onTableMouseClicked" xmlns="http://javafx.com/javafx/8.0.60"
+           xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.nianna.karedi.controller.TagsTableController">
+    <columns>
+        <TableColumn fx:id="keyColumn" onEditStart="#onKeyColumnEditStart"
+                     sortable="false" text="%common.tag_key" maxWidth="35000"/>
+        <TableColumn fx:id="valueColumn" onEditCancel="#onValueColumnEditCancel"
+                     onEditCommit="#onValueColumnEditCommit" onEditStart="#onValueColumnEditStart"
+                     sortable="false" text="%common.tag_value" maxWidth="65000"/>
+    </columns>
+    <columnResizePolicy>
+        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+    </columnResizePolicy>
+    <contextMenu>
+        <ContextMenu fx:id="baseContextMenu">
+            <items>
+                <MenuItem mnemonicParsing="false" onAction="#handleAdd"
+                          text="%common.add"/>
+            </items>
+        </ContextMenu>
+    </contextMenu>
+</TableView>