Changeset 7375 in josm for trunk/src


Ignore:
Timestamp:
2014-08-10T14:52:11+02:00 (5 years ago)
Author:
Don-vip
Message:

fix #10362 - wrong layout in advanced tab of upload dialog (regression from r6901)

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
3 edited

Legend:

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

    r7358 r7375  
    233233                }
    234234        );
     235
     236        setMinimumSize(new Dimension(300, 350));
    235237
    236238        Main.pref.addPreferenceChangeListener(this);
  • trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

    r7005 r7375  
    105105        gc.gridx = 1;
    106106        gc.gridy = 1;
    107         gc.weightx = 0.0;
     107        gc.weightx = 1.0;
    108108        gc.weighty = 0.0;
    109109        gc.gridwidth = 2;
     
    113113        gc.gridx = 3;
    114114        gc.gridy = 1;
    115         gc.weightx = 1.0;
     115        gc.weightx = 0.0;
    116116        gc.weighty = 0.0;
    117117        gc.gridwidth = 1;
     
    126126        gc.gridx = 1;
    127127        gc.gridy = 2;
    128         gc.weightx = 0.0;
     128        gc.weightx = 1.0;
    129129        gc.weighty = 0.0;
    130130        gc.gridwidth = 1;
     
    140140        gc.gridx = 3;
    141141        gc.gridy = 2;
    142         gc.weightx = 1.0;
     142        gc.weightx = 0.0;
    143143        gc.weighty = 0.0;
    144144        gc.gridwidth = 1;
     
    153153        gc.gridx = 1;
    154154        gc.gridy = 3;
    155         gc.weightx = 0.0;
     155        gc.weightx = 1.0;
    156156        gc.weighty = 0.0;
    157157        gc.gridwidth = 2;
     
    161161        gc.gridx = 3;
    162162        gc.gridy = 3;
    163         gc.weightx = 1.0;
     163        gc.weightx = 0.0;
    164164        gc.weighty = 0.0;
    165165        gc.gridwidth = 1;
  • trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java

    r6830 r7375  
    3030        super(doc, text, columns);
    3131        TextContextualPopupMenu.enableMenuFor(this);
     32        // Fix minimum size when columns are specified
     33        if (columns > 0) {
     34            setMinimumSize(getPreferredSize());
     35        }
    3236    }
    3337
Note: See TracChangeset for help on using the changeset viewer.