conflict dialogue bottom buttons half hidden

[skyper]

Thanks for your work. :)

I have a similar problem to #7819.
In the conflict dialogue the buttons on the bottom are partly hidden due to a too small default window size. This happens with metal-look but I have seen similar with gtk (not talking about other problems) starting with non-existing preferences.

I am using a small screen with a resolution of 1024x768.

Repository Root: http://josm.openstreetmap.de/svn
Build-Date: 2012-06-30 01:31:12
Last Changed Author: Don-vip
Revision: 5309
Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
URL: http://josm.openstreetmap.de/svn/trunk
Last Changed Date: 2012-06-29 22:12:06 +0200 (Fri, 29 Jun 2012)
Last Changed Rev: 5309

Identification: JOSM/1.5 (5309 en)
Memory Usage: 68 MB / 241 MB (33 MB allocated, but free)
Java version: 1.6.0_18, Sun Microsystems Inc., OpenJDK 64-Bit Server VM
Operating system: Linux
Dataset consistency test: No problems found

[skyper]

screenshot

[skyper]

Checked on a different machine with Debian wheezy, Gnome 3 and 1920x1050 resolution.

Same issue. The window is way too small.
r5570

java version "1.6.0_24"
OpenJDK Runtime Environment (IcedTea6 1.11.5) (6b24-1.11.5-1)
OpenJDK 64-Bit Server VM (build 20.0-b12, mixed mode)

[Don-vip]

Still an issue ?

I can reduce the size of this dialog without problem:

[skyper]

I have to recheck but I am not really sure. Think I have seen a similar issue with another java application which could mean that it is a problem of gnome3 and its java integration in generell.

[skyper]

What I can tell for sure is that conflict management between layers is totally broken now.

1. Simply downloading the same node in two different layers
2. adding the same key with different values to both
3. merging the layers

no conflict is reported. e.g. it is not that simple to create a conflict ATM.

Repository Root: http://josm.openstreetmap.de/svn
Build-Date: 2014-02-04 02:35:03
Last Changed Author: Don-vip
Revision: 6808
Repository UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
URL: http://josm.openstreetmap.de/svn/trunk
Last Changed Date: 2014-02-04 00:21:44 +0100 (Tue, 04 Feb 2014)
Last Changed Rev: 6808

Identification: JOSM/1.5 (6808 en) Linux Debian GNU/Linux 7.3 (wheezy)
Memory Usage: 187 MB / 672 MB (55 MB allocated, but free)
Java version: 1.7.0_25, Oracle Corporation, OpenJDK 64-Bit Server VM
Java package: openjdk-7-jre:amd64-7u25-2.3.10-1~deb7u1
VM arguments: [-Djosm.home=/tmp/.josm]
Program arguments: [--language=en]
Dataset consistency test: No problems found

[skyper]

Replying to Don-vip:

Still an issue ?

Yes, still the same.

I can reduce the size of this dialog without problem:

Problem is the width and not the height. If the width is too small and a second line is needed the border is not adjusted properly.

The default width is small enough to show this problem.