Mercurial Hosting > junotu

changeset 40:979e9183aac8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TabColumns: Layout progress
author Fox
date Fri, 21 Oct 2022 17:08:34 +0200
parents 27f2a22399d1
children 101ad0b0ab6f
files src/junotu/TabColumns.java
diffstat 1 files changed, 27 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/junotu/TabColumns.java	Thu Oct 20 17:19:05 2022 +0200
+++ b/src/junotu/TabColumns.java	Fri Oct 21 17:08:34 2022 +0200
@@ -6,6 +6,7 @@
 
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.GridBagConstraints;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.ActionEvent;
@@ -20,6 +21,7 @@
 import javax.swing.Box;
 
 import java.awt.BorderLayout;
+import java.awt.GridBagLayout;
 import javax.swing.BoxLayout;
 
 import javax.swing.JButton;
@@ -38,6 +40,9 @@
 
 public class TabColumns extends JPanel {
 
+    final static int COLUMN_CONTENT_WIDTH = 256;
+    final static int COLUMN_WIDTH = COLUMN_CONTENT_WIDTH+16;
+    
     private class ColumnWidget extends JPanel {
 	JLabel title;
 	JTextField titleEdit;
@@ -46,8 +51,7 @@
 
 	public ColumnWidget()
 	{
-	    /* TODO: Maybe gridbag layout will do the trick. */
-	    this.setLayout( new BoxLayout(this, BoxLayout.Y_AXIS) );
+	    this.setLayout( new GridBagLayout() );
 	    
 	    title = new JLabel("");
 	    cards = Box.createVerticalBox();
@@ -56,16 +60,26 @@
 	    title.setFont( new Font( "Monospaced", Font.PLAIN, 16 ) );
 	    addCard.setFont( new Font( "Monospaced", Font.BOLD, 32 ) );
 
-	    cards.add( addCard );
-	    this.add( cards );
-	    this.add( Box.createVerticalGlue() );
+	    GridBagConstraints constraints = new GridBagConstraints();
+	    constraints.anchor = GridBagConstraints.NORTHWEST;
+	    constraints.fill = GridBagConstraints.HORIZONTAL;
+	    constraints.weightx = 1.0;
+	    constraints.gridx = 0;
+	    constraints.gridy = 0;
 
-	    addCard.setPreferredSize( new Dimension( 1000000, 64 ) );
-	    addCard.setMaximumSize( new Dimension( 1000000, 64 ) );
+	    this.add( cards, constraints );
+	    constraints.gridy++;
+	    this.add( addCard, constraints );
+	    constraints.gridy++;
+	    constraints.weighty = 1.0;
+	    this.add( Box.createVerticalGlue(), constraints );
+
+	    addCard.setPreferredSize( new Dimension( COLUMN_CONTENT_WIDTH, 64 ) );
+	    addCard.setMaximumSize( new Dimension( COLUMN_CONTENT_WIDTH, 64 ) );
 	    addCard.setAlignmentX( JButton.CENTER_ALIGNMENT );
 
-	    this.setPreferredSize( new Dimension( 256+16, 384 ) );
-	    this.setMaximumSize( new Dimension( 256+16, 1000000 ) );
+	    //this.setPreferredSize( new Dimension( COLUMN_WIDTH, 384 ) );
+	    this.setMaximumSize( new Dimension( COLUMN_WIDTH, 1000000 ) );
 
 	    this.setBorder(
 	        BorderFactory.createTitledBorder(
@@ -92,7 +106,7 @@
 	public void insertCard( Card card, int at )
 	{
 	    if( at == -1 ) {
-		at = cards.getComponentCount()-1;
+		at = cards.getComponentCount();
 	    }
 	    ColumnCardWidget cardWidget = new ColumnCardWidget( card );
 	    /* TODO: Check if works properly. */
@@ -113,9 +127,9 @@
 	    
 	    title.setFont( new Font( "Monospaced", Font.BOLD, 16 ) );
 		
-	    this.setMinimumSize( new Dimension( 256, 64 ) );
-	    this.setPreferredSize( new Dimension( 256, 64 ) );
-	    this.setMaximumSize( new Dimension( 256, 128 ) );
+	    this.setMinimumSize( new Dimension( COLUMN_CONTENT_WIDTH, 64 ) );
+	    this.setPreferredSize( new Dimension( COLUMN_CONTENT_WIDTH, 64 ) );
+	    this.setMaximumSize( new Dimension( COLUMN_CONTENT_WIDTH, 128 ) );
 
 	    //title.setMinimumSize( new Dimension( 32, 32 ) );