Changeset 6058 in josm for trunk

Timestamp:

2013-07-08T08:28:17+02:00 (11 years ago)

Author:

akks

Message:

see #7503: allow to disable highlighting of members/primitives (for slow machines)
(using old Draw target highlight option in display preferences)

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• RelationListDialog.java (modified) (3 diffs)
• SelectionListDialog.java (modified) (3 diffs)
• relation/MemberTable.java (modified) (5 diffs)

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

@@ -116 +116 @@
     
     HighlightHelper highlightHelper = new HighlightHelper();
-    
+    private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
     /**
      * Constructs <code>RelationListDialog</code>
@@ -194 +194 @@
         
         //update highlights
-        if (focused==displaylist && Main.isDisplayingMapView()) {
+        if (highlightEnabled && focused==displaylist && Main.isDisplayingMapView()) {
             if (highlightHelper.highlightOnly(sel)) {
                 Main.map.mapView.repaint();
@@ -316 +316 @@
         @Override
         public void mouseExited(MouseEvent me) {
-            highlightHelper.clear();
+            if (highlightEnabled) highlightHelper.clear();
         }
         

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

@@ -188 +188 @@
     class MouseEventHandler extends PopupMenuLauncher {
         private final HighlightHelper helper = new HighlightHelper();
-        
+        private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
         public MouseEventHandler() {
             super(popupMenu);
@@ -201 +201 @@
                 if (layer == null) return;
                 layer.data.setSelected(Collections.singleton((OsmPrimitive)model.getElementAt(idx)));
-            } else if (Main.isDisplayingMapView()) {
+            } else if (highlightEnabled && Main.isDisplayingMapView()) {
                 if (helper.highlightOnly((OsmPrimitive)model.getElementAt(idx))) {
                     Main.map.mapView.repaint();
@@ -210 +210 @@
         @Override
         public void mouseExited(MouseEvent me) {
-            helper.clear();
+            if (highlightEnabled) helper.clear();
             super.mouseExited(me);
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45 +43 @@
     private ZoomToGapAction zoomToGap;
     private HighlightHelper highlightHelper = new HighlightHelper();
+    private boolean highlightEnabled;
 
     /**
@@ -142 +141 @@
     
     private void initHighlighting() {
+        highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
+        if (!highlightEnabled) return;
         getMemberTableModel().getSelectionModel().addListSelectionListener(highlighterListener);
         if (Main.isDisplayingMapView()) {
@@ -158 +159 @@
      */
     class SelectNextColumnCellAction extends AbstractAction {
+        @Override
         public void actionPerformed(ActionEvent e) {
             run();
@@ -212 +214 @@
     public void stopHighlighting() {
         if (highlighterListener == null) return;
+        if (!highlightEnabled) return;
         getMemberTableModel().getSelectionModel().removeListSelectionListener(highlighterListener);
         highlighterListener = null;