Changeset 25463 in osm for applications/editors

Timestamp:

2011-02-27T19:30:17+01:00 (14 years ago)

Author:

guggis

Message:

'Fixing #6016 - Scrollbar hides field entry'

Location:

applications/editors/josm/plugins/turnrestrictions

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java (modified) (2 diffs)
• test/josm.home/preferences (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/build.xml

@@ -31 +31 @@
 
         <!-- enter the SVN commit message -->
-        <property name="commit.message" value="Fixing #5614 - JOSM Plugin turn Restrictions" />
+        <property name="commit.message" value="Fixing #6016  - Scrollbar hides field entry" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
         <property name="plugin.main.version" value="3835" />

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -88 +90 @@
         gc.gridx = 1;
         gc.weightx = 1.0;
+        gc.weighty = 1.0;
         DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
-        add(spVias = new JScrollPane(lstVias = new ViaList(new ViaListModel(model, selectionModel), selectionModel)),gc);
+        spVias = new JScrollPane(lstVias = new ViaList(new ViaListModel(model, selectionModel), selectionModel)) {
+                // fixes #6016 : Scrollbar hides field entry
+                public Dimension getPreferredSize() {
+                        return new Dimension(100, 80); // only height is relevant, 80 is just a heuristical value
+             }
+        };
+        add(spVias,gc);
         if (!Main.pref.getBoolean(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, false)) {
             lblVias.setVisible(false);
@@ -100 +109 @@
         gc.gridy = 4;
         gc.weightx = 1.0;
+        gc.weighty = 0.0;
         gc.gridwidth = 2;
         gc.insets = new Insets(0,0,5,5);    

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
@@ -93 +94 @@
     }
     
-    /**
+    @Override
+        public Dimension getPreferredScrollableViewportSize() {
+                //return super.getPreferredSize();
+        Dimension d = getPreferredSize();
+        d.height = Math.max(d.height, 100);
+        return d;
+        }
+
+        /**
      * The transfer handler for Drag-and-Drop. 
      */

applications/editors/josm/plugins/turnrestrictions/test/josm.home/preferences

@@ +1 @@
+josm.version=3773
 osm-server.url=http://localhost:8080/api
+scripting.RunScriptDialog.file-history=asdfasdfasdfsdf
+scripting.RunScriptDialog.last-file=asdfasdfasdfsdf