Changeset 12046 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

Timestamp:

2017-05-03T14:07:20+02:00 (8 years ago)

Author:

michael2402

Message:

In conflict resolution dialog, only scroll tab contents and prevent vertical scroll bar from appearing on small screens just because the horizontal scroll bar makes the dialog content smaller.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -102 +102 @@
         HelpUtil.setHelpContext(this.getRootPane(), ht("Dialog/Conflict"));
 
-        setContent(p);
+        setContent(p, false);
     }