Changeset 18755 in josm for trunk/src

Timestamp:

2023-06-14T14:10:09+02:00 (17 months ago)

Author:

taylor.smock

Message:

Fix #22751: Improve fullscreen mode (patch by kolesar, modified)

• Remove 1 pixel border drawn around map
• Remove 1 pixel border drawn when in ImproveWayAccuracy mode and in the SELECTING state when there is a way under the mouse
• Add advanced preference (navigation.always-visible, default true) which hides zoom and scale controls

Modifications are cleaning up some SonarLint issues.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DialogsToggleAction.java (modified) (1 diff)
• gui/MapFrame.java (modified) (7 diffs)
• gui/MapView.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java

@@ -66 +66 @@
                 MapFrame.SIDE_TOOLBAR_VISIBLE.put(selected);
             }
+            map.mapView.setMapNavigationComponentVisibility(selected || Config.getPref().getBoolean("navigation.always-visible", true));
             map.mapView.rememberLastPositionOnScreen();
         }

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -39 +39 @@
 import javax.swing.KeyStroke;
 import javax.swing.SwingConstants;
-import javax.swing.border.Border;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
 import javax.swing.plaf.basic.BasicArrowButton;
-import javax.swing.plaf.basic.BasicSplitPaneDivider;
-import javax.swing.plaf.basic.BasicSplitPaneUI;
 
 import org.openstreetmap.josm.actions.ExpertToggleAction;
@@ -227 +224 @@
         splitPane.setDividerSize(5);
         splitPane.setBorder(null);
-        splitPane.setUI(new NoBorderSplitPaneUI());
 
         // JSplitPane supports F6, F8, Home and End shortcuts by default, but we need them for Audio and Image Mapping actions
@@ -313 +309 @@
      */
     public boolean selectSelectTool(boolean onlyIfModeless) {
-        if (onlyIfModeless && !MODELESS.get())
+        if (onlyIfModeless && Boolean.FALSE.equals(MODELESS.get()))
             return false;
 
@@ -325 +321 @@
      */
     public boolean selectDrawTool(boolean onlyIfModeless) {
-        if (onlyIfModeless && !MODELESS.get())
+        if (onlyIfModeless && Boolean.FALSE.equals(MODELESS.get()))
             return false;
 
@@ -337 +333 @@
      */
     public boolean selectZoomTool(boolean onlyIfModeless) {
-        if (onlyIfModeless && !MODELESS.get())
+        if (onlyIfModeless && Boolean.FALSE.equals(MODELESS.get()))
             return false;
 
@@ -568 +564 @@
         if (statusLine != null && Config.getPref().getBoolean("statusline.visible", true)) {
             panel.add(statusLine, BorderLayout.SOUTH);
-        }
-    }
-
-    static final class NoBorderSplitPaneUI extends BasicSplitPaneUI {
-        static final class NoBorderBasicSplitPaneDivider extends BasicSplitPaneDivider {
-            NoBorderBasicSplitPaneDivider(BasicSplitPaneUI ui) {
-                super(ui);
-            }
-
-            @Override
-            public void setBorder(Border b) {
-                // Do nothing
-            }
-        }
-
-        @Override
-        public BasicSplitPaneDivider createDefaultDivider() {
-            return new NoBorderBasicSplitPaneDivider(this);
         }
     }
@@ -685 +663 @@
                         @Override
                         public void actionPerformed(ActionEvent e) {
-                            if ((Boolean) getValue(SELECTED_KEY)) {
+                            if (Boolean.TRUE.equals(getValue(SELECTED_KEY))) {
                                 t.showButton();
                             } else {

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -3 +3 @@
 
 import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -10 +11 @@
 import java.awt.Rectangle;
 import java.awt.Shape;
+import java.awt.Stroke;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
@@ -103 +105 @@
                     MainApplication.getLayerManager().getLayers()
                         .stream()
-                        .filter(layer -> layer instanceof OsmDataLayer)
+                        .filter(OsmDataLayer.class::isInstance)
                         .forEach(Layer::invalidate)
                 );
@@ -237 +239 @@
     private transient MapMover mapMover;
 
+    private final List<? extends JComponent> mapNavigationComponents;
+    private final Stroke worldBorderStroke = new BasicStroke(1.0f);
+
     /**
      * The listener that listens to invalidations of all layers.
@@ -294 +299 @@
         setFocusTraversalKeysEnabled(!Shortcut.findShortcut(KeyEvent.VK_TAB, 0).isPresent());
 
-        for (JComponent c : getMapNavigationComponents(this)) {
+        mapNavigationComponents = getMapNavigationComponents(this);
+        for (JComponent c : mapNavigationComponents) {
             add(c);
         }
-        if (AutoFilterManager.PROP_AUTO_FILTER_ENABLED.get()) {
+        if (Boolean.TRUE.equals(AutoFilterManager.PROP_AUTO_FILTER_ENABLED.get())) {
             AutoFilterManager.getInstance().enableAutoFilterRule(AutoFilterManager.PROP_AUTO_FILTER_RULE.get());
         }
@@ -659 +665 @@
     private void drawWorldBorders(Graphics2D tempG) {
         tempG.setColor(Color.WHITE);
+        tempG.setStroke(worldBorderStroke);
         Bounds b = getProjection().getWorldBoundsLatLon();
 
@@ -912 +919 @@
         return mapMover;
     }
+
+    /**
+     * Set the visibility of the navigation component
+     * @param visible {@code true} to make the navigation component visible
+     * @since 18755
+     */
+    public void setMapNavigationComponentVisibility(boolean visible) {
+        for (JComponent c : mapNavigationComponents) {
+            c.setVisible(visible);
+        }
+    }
 }