ui layout fix (label height)

jlawyerorg · May 3, 2024 · 28da775 · 28da775
1 parent e62a1f3
commit 28da775
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceEntryPanel.form b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceEntryPanel.form
@@ -81,15 +81,20 @@
                   <Component id="cmdDuplicate" min="-2" max="-2" attributes="0"/>
                   <Component id="cmdCopy" min="-2" max="-2" attributes="0"/>
                   <Group type="102" alignment="0" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="103" alignment="0" groupAlignment="3" attributes="0">
-                              <Component id="lblInvoiceNumber" alignment="3" min="-2" max="-2" attributes="0"/>
-                              <Component id="lblStatus" alignment="3" min="-2" pref="28" max="-2" attributes="0"/>
-                              <Component id="cmdMarkAsPayed" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                          <Group type="102" attributes="0">
+                              <Group type="103" groupAlignment="3" attributes="0">
+                                  <Component id="lblInvoiceNumber" alignment="3" min="-2" max="-2" attributes="0"/>
+                                  <Component id="lblStatus" alignment="3" min="-2" pref="28" max="-2" attributes="0"/>
+                                  <Component id="cmdMarkAsPayed" alignment="3" min="-2" max="-2" attributes="0"/>
+                              </Group>
+                              <EmptySpace max="-2" attributes="0"/>
+                          </Group>
+                          <Group type="102" attributes="0">
+                              <Component id="lblDueDate" max="32767" attributes="0"/>
+                              <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
                           </Group>
-                          <Component id="lblDueDate" alignment="0" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" attributes="0">
                               <Group type="103" groupAlignment="3" attributes="0">

diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceEntryPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/editors/files/InvoiceEntryPanel.java
@@ -938,13 +938,16 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                     .addComponent(cmdDuplicate)
                     .addComponent(cmdCopy)
                     .addGroup(layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                                .addComponent(lblInvoiceNumber)
-                                .addComponent(lblStatus, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                .addComponent(cmdMarkAsPayed))
-                            .addComponent(lblDueDate))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                            .addGroup(layout.createSequentialGroup()
+                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                                    .addComponent(lblInvoiceNumber)
+                                    .addComponent(lblStatus, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(cmdMarkAsPayed))
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
+                            .addGroup(layout.createSequentialGroup()
+                                .addComponent(lblDueDate, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                .addGap(6, 6, 6)))
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(layout.createSequentialGroup()
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)