Skip to content

JPRO-183 fix window resize issues around all propertie descriptions #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carldea merged 2 commits into from
Sep 3, 2025
Merged

JPRO-183 fix window resize issues around all propertie descriptions #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2f0f8a
JPRO-183 fix window resize issues around all propertie description co…
vollbrecht-work Aug 31, 2025
7c0ae25
Merge branch 'main' into JPRO-183-shrinking-a-window-can-make-its-con…
carldea Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ...c/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddFullyQualifiedNameController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,19 @@ public class AddFullyQualifiedNameController extends AbstractBasicController {
private Label addFqnTitleLabel;

@FXML
private ComboBox<EntityFacade> moduleComboBox;
private TextField fullyQualifiedNameTextField;

@FXML
private TextField fullyQualifiedNameTextField;
private ComboBox<ConceptEntity> typeDisplayComboBox;

@FXML
private ComboBox<EntityFacade> caseSignificanceComboBox;

@FXML
private ComboBox<EntityFacade> statusComboBox;

@FXML
private ComboBox<EntityFacade> caseSignificanceComboBox;
private ComboBox<EntityFacade> moduleComboBox;

@FXML
private ComboBox<EntityFacade> languageComboBox;
Expand Down Expand Up @@ -253,7 +256,7 @@ private void saveFullQualifiedName(ActionEvent actionEvent) {
}

@FXML
public void cancel() {
public void handleCancelButtonEvent() {
close();
}

Expand Down
11 changes: 7 additions & 4 deletions kview/src/main/java/dev/ikm/komet/kview/mvvm/view/properties/AddOtherNameController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,19 @@ public class AddOtherNameController extends AbstractBasicController {
private Label addOtherNameTitleLabel;

@FXML
private ComboBox<EntityFacade> moduleComboBox;
private TextField otherNameTextField;

@FXML
private TextField otherNameTextField;
private ComboBox<EntityFacade> typeDisplayComboBox;

@FXML
private ComboBox<EntityFacade> caseSignificanceComboBox;

@FXML
private ComboBox<EntityFacade> statusComboBox;

@FXML
private ComboBox<EntityFacade> caseSignificanceComboBox;
private ComboBox<EntityFacade> moduleComboBox;

@FXML
private ComboBox<EntityFacade> languageComboBox;
Expand Down Expand Up @@ -263,7 +266,7 @@ public void clearView() {
}

@FXML
public void cancel() {
public void handleCancelButtonEvent() {
close();
}

Expand Down
12 changes: 6 additions & 6 deletions ...src/main/java/dev/ikm/komet/kview/mvvm/view/properties/EditDescriptionFormController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ public class EditDescriptionFormController implements BasicController {
private TextField otherNameTextField;

@FXML
private ComboBox<ConceptEntity> comboBox;
private ComboBox<ConceptEntity> typeDisplayComboBox;

@FXML
private ComboBox<ConceptEntity> moduleComboBox;
private ComboBox<ConceptEntity> caseSignificanceComboBox;

@FXML
private ComboBox<ConceptEntity> statusComboBox;

@FXML
private ComboBox<ConceptEntity> caseSignificanceComboBox;
private ComboBox<ConceptEntity> moduleComboBox;

@FXML
private ComboBox<ConceptEntity> languageComboBox;
Expand All @@ -106,13 +106,13 @@ public class EditDescriptionFormController implements BasicController {
private Label editDescriptionTitleLabel;

@FXML
private Label dialect1;
private Label dialect1Label;

@FXML
private Label dialect2;
private Label dialect2Label;

@FXML
private Label dialect3;
private Label dialect3Label;

@FXML
private ComboBox dialectComboBox1;
Expand Down
9 changes: 6 additions & 3 deletions .../main/java/dev/ikm/komet/kview/mvvm/view/properties/EditFullyQualifiedNameController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ public class EditFullyQualifiedNameController implements BasicController {
@FXML
private TextField fqnText;

@FXML
private ComboBox<ConceptEntity> typeDisplayComboBox;

@FXML
private ComboBox<ConceptEntity> moduleComboBox;

Expand All @@ -81,13 +84,13 @@ public class EditFullyQualifiedNameController implements BasicController {
private ComboBox<ConceptEntity> languageComboBox;

@FXML
private Label dialect1;
private Label dialect1Label;

@FXML
private Label dialect2;
private Label dialect2Label;

@FXML
private Label dialect3;
private Label dialect3Label;

@FXML
private ComboBox dialectComboBox1;
Expand Down
213 changes: 114 additions & 99 deletions ...src/main/resources/dev/ikm/komet/kview/mvvm/view/properties/add-fully-qualified-name.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,102 +14,117 @@
<?import javafx.scene.layout.VBox?>
<?import dev.ikm.komet.kview.controls.SortedComboBox?>

<BorderPane minHeight="100.0" minWidth="100.0" prefWidth="487.0" stylesheets="@../kview.css" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1">
<top>
<HBox alignment="TOP_CENTER" prefHeight="0.0" prefWidth="0.0" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
<children>
<Label fx:id="addFqnTitleLabel" alignment="TOP_CENTER" styleClass="edit-concept-title" text="Add Description: Fully Qualified Name" textAlignment="CENTER" />
</children>
</HBox>
</top>
<bottom>
<VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER">
<children>
<HBox alignment="BOTTOM_RIGHT" styleClass="add-description-bottom-label">
<children>
<Label text="Purpose of this semantic is to help define this concept." />
</children>
</HBox>
<HBox alignment="BOTTOM_RIGHT" layoutX="10.0" layoutY="110.0" prefHeight="50.0" prefWidth="200.0">
<children>
<ButtonBar prefHeight="75.0" prefWidth="200.0">
<buttons>
<Button mnemonicParsing="false" onAction="#cancel" styleClass="edit-concept-cancel-button" text="CANCEL" />
<Button fx:id="submitButton" layoutX="135.0" layoutY="47.0" minWidth="63.0" mnemonicParsing="false" onAction="#saveFullQualifiedName" styleClass="edit-concept-submit-button" text="SUBMIT" />
</buttons>
</ButtonBar>
</children>
<opaqueInsets>
<Insets />
</opaqueInsets>
<VBox.margin>
<Insets right="20.0" />
</VBox.margin>
</HBox>
</children>
</VBox>
</bottom>
<center>
<GridPane prefWidth="487.0" BorderPane.alignment="CENTER">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
<ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="40.0" minHeight="10.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="1.7976931348623157E308" vgrow="NEVER" />
<RowConstraints vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label styleClass="add-description-label" text="Name" />
<Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
<Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
<Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
<Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
<Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
<TextField styleClass="komet-text-field" fx:id="fullyQualifiedNameTextField" prefHeight="25.0" promptText="Enter Name" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</TextField>
<SortedComboBox styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Fully Qualified Name" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</SortedComboBox>
<SortedComboBox fx:id="caseSignificanceComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select case sensitivity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</SortedComboBox>
<SortedComboBox fx:id="languageComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Language" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</SortedComboBox>
<SortedComboBox fx:id="statusComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Status" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</SortedComboBox>
<SortedComboBox fx:id="moduleComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Module" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</SortedComboBox>
<TextArea styleClass="komet-text-area" maxHeight="80.0" maxWidth="1.7976931348623157E308" text="Add comment here..." GridPane.columnSpan="2" GridPane.rowIndex="7">
<GridPane.margin>
<Insets left="15.0" right="15.0" />
</GridPane.margin>
</TextArea>
<Label styleClass="add-description-label" text="Comments" GridPane.rowIndex="6" />
</children>
</GridPane>
</center>
</BorderPane>
<BorderPane minWidth="100.0" prefWidth="487.0" stylesheets="@../kview.css" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1">
<top>
<HBox alignment="TOP_CENTER" minHeight="40.0" prefHeight="40.0" prefWidth="0.0" styleClass="edit-concept-label-container" BorderPane.alignment="TOP_CENTER">
<children>
<Label fx:id="addFqnTitleLabel" alignment="TOP_CENTER" styleClass="edit-concept-title" text="Add Description: Fully Qualified Name" textAlignment="CENTER" />
</children>
</HBox>
</top>
<bottom>
<VBox alignment="TOP_CENTER" BorderPane.alignment="CENTER" minHeight="80.0" prefHeight="80.0">
<children>
<HBox alignment="BOTTOM_RIGHT" styleClass="add-description-bottom-label">
<children>
<Label text="Purpose of this semantic is to help define this concept." />
</children>
</HBox>
<HBox alignment="BOTTOM_RIGHT" layoutX="10.0" layoutY="110.0" prefHeight="50.0" prefWidth="200.0">
<children>
<ButtonBar prefHeight="75.0" prefWidth="200.0">
<buttons>
<Button fx:id="cancelButton" mnemonicParsing="false" onAction="#handleCancelButtonEvent" styleClass="edit-concept-cancel-button" text="CANCEL" />
<Button fx:id="submitButton" layoutX="135.0" layoutY="47.0" minWidth="63.0" mnemonicParsing="false" onAction="#saveFullQualifiedName" styleClass="edit-concept-submit-button" text="SUBMIT" />
</buttons>
</ButtonBar>
</children>
<opaqueInsets>
<Insets />
</opaqueInsets>
<VBox.margin>
<Insets right="20.0" />
</VBox.margin>
</HBox>
</children>
</VBox>
</bottom>
<center>
<GridPane prefWidth="487.0" BorderPane.alignment="CENTER">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="100.0" minWidth="100.0" prefWidth="100.0" />
<ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" prefWidth="400.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
<!-- Comments label -->
<RowConstraints fx:id="dialectCommentsRowConstraints" minHeight="40.0" prefHeight="40.0" maxHeight="40.0" vgrow="SOMETIMES" />
<!-- Comments section -->
<RowConstraints vgrow="SOMETIMES" minHeight="80.0"/>
</rowConstraints>
<children>
<Label styleClass="add-description-label" text="Name" GridPane.rowIndex="0" />
<Label styleClass="add-description-label" text="Type" GridPane.rowIndex="1" />
<Label prefWidth="100.0" styleClass="add-description-label" text="Case Significance" wrapText="true" GridPane.rowIndex="2" />
<Label styleClass="add-description-label" text="Status" GridPane.rowIndex="3" />
<Label styleClass="add-description-label" text="Module" GridPane.rowIndex="4" />
<Label styleClass="add-description-label" text="Language" GridPane.rowIndex="5" />
<Label fx:id="commentsLabel" styleClass="add-description-label" text="Comments" GridPane.rowIndex="6" />

<!-- Name field -->
<TextField fx:id="fullyQualifiedNameTextField" styleClass="komet-text-field" prefHeight="25.0" promptText="Enter Name" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.hgrow="ALWAYS">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</TextField>

<!-- Type display (disabled combo box used as label) -->
<SortedComboBox fx:id="typeDisplayComboBox" styleClass="blue-arrow-combo-box" disable="true" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Type" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</SortedComboBox>

<!-- Case Significance -->
<SortedComboBox fx:id="caseSignificanceComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select case sensitivity" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</SortedComboBox>

<!-- Status -->
<SortedComboBox fx:id="statusComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Status" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</SortedComboBox>

<!-- Module -->
<SortedComboBox fx:id="moduleComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Module" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</SortedComboBox>

<!-- Language -->
<SortedComboBox fx:id="languageComboBox" styleClass="blue-arrow-combo-box" maxWidth="1.7976931348623157E308" prefHeight="25.0" promptText="Select Language" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="5">
<GridPane.margin>
<Insets right="15.0" />
</GridPane.margin>
</SortedComboBox>

<!-- Comments -->
<TextArea fx:id="commentsTextArea" styleClass="komet-text-area" maxHeight="80.0" maxWidth="1.7976931348623157E308" text="Add comment here..." GridPane.columnSpan="2" GridPane.rowIndex="7" GridPane.valignment="TOP">
<GridPane.margin>
<Insets left="15.0" right="15.0" />
</GridPane.margin>
</TextArea>
</children>
</GridPane>
</center>
</BorderPane>
Loading