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