Index: applications/editors/josm/plugins/buildings_tools/build.xml
===================================================================
--- applications/editors/josm/plugins/buildings_tools/build.xml	(revision 35170)
+++ applications/editors/josm/plugins/buildings_tools/build.xml	(revision 35171)
@@ -2,5 +2,5 @@
 <project name="buildings_tools" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="BuildingTools: Alt key to disable tags"/>
+    <property name="commit.message" value="buildings_tools: add option to disable click+drag"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="14960"/>
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/AdvancedSettingsDialog.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/AdvancedSettingsDialog.java	(revision 35170)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/AdvancedSettingsDialog.java	(revision 35171)
@@ -19,4 +19,5 @@
     private final JCheckBox cBigMode = new JCheckBox(tr("Big buildings mode"));
     private final JCheckBox cSoftCur = new JCheckBox(tr("Rotate crosshair"));
+    private final JCheckBox cNoClickDrag = new JCheckBox(tr("Disable click+drag"));
 
     public AdvancedSettingsDialog() {
@@ -32,7 +33,9 @@
         panel.add(cBigMode, GBC.eol().fill(GBC.HORIZONTAL));
         panel.add(cSoftCur, GBC.eol().fill(GBC.HORIZONTAL));
+        panel.add(cNoClickDrag, GBC.eol().fill(GBC.HORIZONTAL));
 
         cBigMode.setSelected(ToolSettings.isBBMode());
         cSoftCur.setSelected(ToolSettings.isSoftCursor());
+        cNoClickDrag.setSelected(ToolSettings.isNoClickAndDrag());
 
         setupDialog();
@@ -44,4 +47,5 @@
         ToolSettings.setBBMode(cBigMode.isSelected());
         ToolSettings.setSoftCursor(cSoftCur.isSelected());
+        ToolSettings.setNoClickAndDrag(cNoClickDrag.isSelected());
     }
 }
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java	(revision 35170)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java	(revision 35171)
@@ -369,7 +369,11 @@
             return;
         boolean dragged = true;
-        if (drawStartPos != null)
+        if (drawStartPos != null) {
             dragged = e.getPoint().distance(drawStartPos) > 10;
-        drawStartPos = null;
+            drawStartPos = null;
+            if (ToolSettings.isNoClickAndDrag()) {
+                return;
+            }
+        }
 
         if (mode == Mode.Drawing && !dragged)
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java	(revision 35170)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java	(revision 35171)
@@ -127,3 +127,11 @@
         autoSelect = _autoSelect;
     }
+
+    public static boolean isNoClickAndDrag() {
+        return Config.getPref().getBoolean("buildings_tools.noclickdrag", false);
+    }
+
+    public static void setNoClickAndDrag(boolean noClickDrag) {
+        Config.getPref().putBoolean("buildings_tools.noclickdrag", noClickDrag);
+    }
 }