X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.ui%2Fsrc%2Forg%2Fsimantics%2Fspreadsheet%2Fui%2FSpreadsheetModel.java;h=dbe3e82648cc313a6f5d6756dc6d30d01cf54067;hp=d534c9488a395dbfb46ceb3093bc0f4063fb73e5;hb=ac5f1da15cc639da880fea86a7b828c8fa2e1b7e;hpb=b8392422ec5b5961202d941ec447018526d26dd2

diff --git a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SpreadsheetModel.java b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SpreadsheetModel.java
index d534c9488..dbe3e8264 100644
--- a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SpreadsheetModel.java
+++ b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/SpreadsheetModel.java
@@ -2,10 +2,9 @@ package org.simantics.spreadsheet.ui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
 import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.datatransfer.Clipboard;
@@ -80,6 +79,7 @@ import org.simantics.ui.dnd.LocalObjectTransfer;
 import org.simantics.ui.dnd.LocalObjectTransferable;
 import org.simantics.ui.fonts.Fonts;
 import org.simantics.utils.ui.dialogs.ShowMessage;
+import org.simantics.utils.ui.awt.WrapLayout;
 import org.simantics.utils.ui.jface.ActiveSelectionProvider;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -938,81 +938,48 @@ public class SpreadsheetModel {
 		
 		if (addExpressionField) {
 			
-			JPanel tools = new JPanel(new GridBagLayout());
+			JPanel tools = new JPanel(new WrapLayout(FlowLayout.LEADING, 0, 0));
 			panel.add(tools, BorderLayout.PAGE_START);
 
-			GridBagConstraints c = new GridBagConstraints();			
+			tools.add(this.font);
 
-			c.gridx = 0;
-	        c.anchor = GridBagConstraints.WEST;
-			tools.add(this.font, c);
+			tools.add(foreground);
 
-			c.gridx = 1;
-			tools.add(foreground, c);
+			tools.add(background);
 
-			c.gridx = 2;
-			tools.add(background, c);
+			tools.add(align_left);
+			tools.add(align_hcenter);
+			tools.add(align_right);
 
-			c.gridx = 3;
-			tools.add(align_left, c);
-			c.gridx = 4;
-			tools.add(align_hcenter, c);
-			c.gridx = 5;
-			tools.add(align_right, c);
+			tools.add(align_top);
+			tools.add(align_vcenter);
+			tools.add(align_bottom);
 
-			c.gridx = 6;
-			tools.add(align_top, c);
-			c.gridx = 7;
-			tools.add(align_vcenter, c);
-			c.gridx = 8;
-			tools.add(align_bottom, c);
+			tools.add(borders);
 
-			c.gridx = 9;
-			tools.add(borders, c);
+			tools.add(lock);
+			tools.add(unlock);
 
-			c.gridx = 10;
-			tools.add(lock, c);
-			c.gridx = 11;
-			tools.add(unlock, c);
+			tools.add(merge);
+			tools.add(unmerge);
 
-			c.gridx = 12;
-			tools.add(merge, c);
-			c.gridx = 13;
-			tools.add(unmerge, c);
-			
-			c.gridx = 14;
-			tools.add(inputSource, c);
+			tools.add(inputSource);
 
-			c.gridx = 15;
-			tools.add(sheets, c);
+			tools.add(sheets);
 
-			c.gridx = 16;
-			tools.add(initialConditions, c);
-			
-			c.gridx = 17;
-			tools.add(saveIc, c);
-			
-			c.gridx = 18;
-			tools.add(context, c);
-			
-			c.gridx = 19;
-			tools.add(operationMode, c);
-			
-			c.gridx = 20;
-			tools.add(iterationEnabled, c);
-			
-			c.gridx = 21;
-			tools.add(iterationLimit, c);
-
-			c.gridx = 0;
-			c.gridy = 1;
-			c.gridwidth = 22;
-	        c.gridheight = 1;
-	        c.weighty = 0.0;
-	        c.weightx = 1.0;
-	        c.fill = GridBagConstraints.HORIZONTAL;
-
-			tools.add(expression,c);
+			tools.add(initialConditions);
+
+			tools.add(saveIc);
+
+			tools.add(context);
+
+			tools.add(operationMode);
+
+			tools.add(iterationEnabled);
+
+			tools.add(iterationLimit);
+
+			tools.add(expression);
 			
 		}
 		panel.add(scroll, BorderLayout.CENTER);