Changeset 10622 in josm


Ignore:
Timestamp:
2016-07-24T13:19:12+02:00 (3 years ago)
Author:
Don-vip
Message:

fix #13198 - Add new flow layout that does the right height computation (patch by michael2402, modified) - gsoc-core

Location:
trunk
Files:
2 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

    r10525 r10622  
    66import static org.openstreetmap.josm.tools.I18n.trn;
    77
    8 import java.awt.BorderLayout;
    98import java.awt.Component;
    109import java.awt.Dimension;
     
    6059import org.openstreetmap.josm.tools.Utils;
    6160import org.openstreetmap.josm.tools.WindowGeometry;
     61import org.openstreetmap.josm.tools.MultiLineFlowLayout;
    6262
    6363/**
     
    166166
    167167        pnl.add(tpConfigPanels, GBC.eol().fill(GBC.HORIZONTAL));
     168
     169        pnl.add(buildActionPanel(), GBC.eol().fill(GBC.HORIZONTAL));
    168170        return pnl;
    169171    }
     
    175177     */
    176178    protected JPanel buildActionPanel() {
    177         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
     179        JPanel pnl = new JPanel(new MultiLineFlowLayout(FlowLayout.CENTER));
    178180        pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
    179181
     
    202204    protected void build() {
    203205        setTitle(tr("Upload to ''{0}''", OsmApi.getOsmApi().getBaseUrl()));
    204         getContentPane().setLayout(new BorderLayout());
    205         getContentPane().add(buildContentPanel(), BorderLayout.CENTER);
    206         getContentPane().add(buildActionPanel(), BorderLayout.SOUTH);
     206        setContentPane(buildContentPanel());
    207207
    208208        addWindowListener(new WindowEventHandler());
Note: See TracChangeset for help on using the changeset viewer.