Render themes: restore display="always" rendering for compatibility with existing render themes by devemux86 · Pull Request #1736 · mapsforge/mapsforge
Expand Up
@@ -41,7 +41,7 @@ public void testLabelClashBounds() {
final Rotation rotation = new Rotation(37, 115, 93);
// Some container ("label") positioned ABOVE final AwtPointTextContainer container = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ALWAYS, 5, "some label", paint, null, null, Position.ABOVE, 150); final AwtPointTextContainer container = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ORDER, 5, "some label", paint, null, null, Position.ABOVE, 150);
// Some origin final Point origin = new Point(17, 19); Expand Down Expand Up @@ -81,8 +81,8 @@ public void testLabelsClash() { // Single-line { // Some containers ("labels") positioned ABOVE final AwtPointTextContainer container1 = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ALWAYS, 5, "12345 67890", paint, null, null, Position.ABOVE, 150); final AwtPointTextContainer container2 = new AwtPointTextContainer(new Point(207, 140), 9, 17, Display.ALWAYS, 5, "12345 67890", paint, null, null, Position.ABOVE, 150); final AwtPointTextContainer container1 = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ORDER, 5, "12345 67890", paint, null, null, Position.ABOVE, 150); final AwtPointTextContainer container2 = new AwtPointTextContainer(new Point(207, 140), 9, 17, Display.ORDER, 5, "12345 67890", paint, null, null, Position.ABOVE, 150);
final int lines1 = container1.boxWidth / container1.maxTextWidth + 1; final int lines2 = container2.boxWidth / container2.maxTextWidth + 1; Expand All @@ -109,8 +109,8 @@ public void testLabelsClash() { // Multi-line { // Some *narrow* containers ("labels") positioned ABOVE final AwtPointTextContainer container1 = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ALWAYS, 5, "12345 67890", paint, null, null, Position.ABOVE, 20); final AwtPointTextContainer container2 = new AwtPointTextContainer(new Point(207, 140), 9, 17, Display.ALWAYS, 5, "12345 67890", paint, null, null, Position.ABOVE, 20); final AwtPointTextContainer container1 = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ORDER, 5, "12345 67890", paint, null, null, Position.ABOVE, 20); final AwtPointTextContainer container2 = new AwtPointTextContainer(new Point(207, 140), 9, 17, Display.ORDER, 5, "12345 67890", paint, null, null, Position.ABOVE, 20);
final int lines1 = container1.boxWidth / container1.maxTextWidth + 1; final int lines2 = container2.boxWidth / container2.maxTextWidth + 1; Expand Down
// Some container ("label") positioned ABOVE final AwtPointTextContainer container = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ALWAYS, 5, "some label", paint, null, null, Position.ABOVE, 150); final AwtPointTextContainer container = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ORDER, 5, "some label", paint, null, null, Position.ABOVE, 150);
// Some origin final Point origin = new Point(17, 19); Expand Down Expand Up @@ -81,8 +81,8 @@ public void testLabelsClash() { // Single-line { // Some containers ("labels") positioned ABOVE final AwtPointTextContainer container1 = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ALWAYS, 5, "12345 67890", paint, null, null, Position.ABOVE, 150); final AwtPointTextContainer container2 = new AwtPointTextContainer(new Point(207, 140), 9, 17, Display.ALWAYS, 5, "12345 67890", paint, null, null, Position.ABOVE, 150); final AwtPointTextContainer container1 = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ORDER, 5, "12345 67890", paint, null, null, Position.ABOVE, 150); final AwtPointTextContainer container2 = new AwtPointTextContainer(new Point(207, 140), 9, 17, Display.ORDER, 5, "12345 67890", paint, null, null, Position.ABOVE, 150);
final int lines1 = container1.boxWidth / container1.maxTextWidth + 1; final int lines2 = container2.boxWidth / container2.maxTextWidth + 1; Expand All @@ -109,8 +109,8 @@ public void testLabelsClash() { // Multi-line { // Some *narrow* containers ("labels") positioned ABOVE final AwtPointTextContainer container1 = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ALWAYS, 5, "12345 67890", paint, null, null, Position.ABOVE, 20); final AwtPointTextContainer container2 = new AwtPointTextContainer(new Point(207, 140), 9, 17, Display.ALWAYS, 5, "12345 67890", paint, null, null, Position.ABOVE, 20); final AwtPointTextContainer container1 = new AwtPointTextContainer(new Point(211, 143), 9, 17, Display.ORDER, 5, "12345 67890", paint, null, null, Position.ABOVE, 20); final AwtPointTextContainer container2 = new AwtPointTextContainer(new Point(207, 140), 9, 17, Display.ORDER, 5, "12345 67890", paint, null, null, Position.ABOVE, 20);
final int lines1 = container1.boxWidth / container1.maxTextWidth + 1; final int lines2 = container2.boxWidth / container2.maxTextWidth + 1; Expand Down