Skip to content
Snippets Groups Projects
Commit 6f7b6a42 authored by Andreas Bayha's avatar Andreas Bayha
Browse files

Annotations: Improved layout

Resized filter widgets, such that all combo content can be displayed
completely.

Issue-Ref: 4014
Issue-Url: https://af3-developer.fortiss.org/issues/4014


Signed-off-by: default avatarAndreas Bayha <bayha@fortiss.org>
parent 8fd377a5
No related branches found
No related tags found
1 merge request!1254014
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<SplitPane fx:id="annotationSplitPane" dividerPositions="0.8567839195979899" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" orientation="VERTICAL" prefHeight="400.0" prefWidth="1191.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1"> <SplitPane fx:id="annotationSplitPane" dividerPositions="0.8567839195979899" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" orientation="VERTICAL" prefHeight="400.0" prefWidth="1266.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
<items> <items>
<AnchorPane fx:id="annotationTablePane" minHeight="0.0" minWidth="0.0" prefHeight="1000.0" prefWidth="160.0"> <AnchorPane fx:id="annotationTablePane" minHeight="0.0" minWidth="0.0" prefHeight="1000.0" prefWidth="160.0">
<children> <children>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<children> <children>
<VBox prefHeight="1000.0" prefWidth="4000.0"> <VBox prefHeight="1000.0" prefWidth="4000.0">
<children> <children>
<HBox prefHeight="40.0" prefWidth="148.0" spacing="5.0"> <HBox prefHeight="23.0" prefWidth="424.0" spacing="5.0">
<children> <children>
<Label minHeight="20.0" text="Filter:" /> <Label minHeight="20.0" text="Filter:" />
<RadioButton fx:id="radBtnFilterModelElements" minHeight="20.0" mnemonicParsing="false" text="model elements" /> <RadioButton fx:id="radBtnFilterModelElements" minHeight="20.0" mnemonicParsing="false" text="model elements" />
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<CheckBox fx:id="chkBoxMatchCase" mnemonicParsing="false" text="match case" /> <CheckBox fx:id="chkBoxMatchCase" mnemonicParsing="false" text="match case" />
</children> </children>
</HBox> </HBox>
<TextField fx:id="txtFilterText" minHeight="30.0" prefHeight="0.0" prefWidth="400.0" promptText="type filter text (regex)" /> <TextField fx:id="txtFilterText" minHeight="30.0" minWidth="390.0" prefHeight="30.0" prefWidth="3000.0" promptText="type filter text (regex)" />
</children> </children>
</VBox> </VBox>
<VBox minWidth="290.0" prefHeight="151.0" prefWidth="167.0"> <VBox minWidth="290.0" prefHeight="151.0" prefWidth="167.0">
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
<VBox minWidth="250.0" prefHeight="151.0" prefWidth="162.0"> <VBox minWidth="250.0" prefHeight="151.0" prefWidth="162.0">
<children> <children>
<Label text="Filter model element hierarchy level:" /> <Label text="Filter model element hierarchy level:" />
<ComboBox fx:id="comboHierarchy" prefWidth="150.0" /> <ComboBox fx:id="comboHierarchy" prefWidth="240.0" />
</children> </children>
</VBox> </VBox>
<VBox minWidth="160.0" prefHeight="151.0" prefWidth="136.0"> <VBox minWidth="225.0" prefHeight="151.0" prefWidth="136.0">
<children> <children>
<Label text="Filter annotation type:" /> <Label text="Filter annotation type:" />
<ComboBox fx:id="comboAnnotationType" prefWidth="150.0" /> <ComboBox fx:id="comboAnnotationType" prefWidth="220.0" />
</children> </children>
</VBox> </VBox>
</children> </children>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment