Add preference to disable ctrl/cmd+mouse1 combo

JakubValtar · JakubValtar · commit c5b358d09ed9 · 2016-05-13T13:05:32.000+02:00
diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java
@@ -316,6 +316,7 @@ void initLogger() {
   static public volatile boolean defaultAutoSaveEnabled = true;
   static public volatile boolean ccTriggerEnabled = false;
   static public volatile boolean importSuggestEnabled = true;
+  static public volatile boolean inspectModeHotkeyEnabled = true;
   static public int autoSaveInterval = 3; //in minutes
 
 
@@ -337,6 +338,7 @@ void initLogger() {
   static public final String COMPLETION_PREF = "pdex.completion";
   static public final String COMPLETION_TRIGGER_PREF = "pdex.completion.trigger";
   static public final String SUGGEST_IMPORTS_PREF = "pdex.suggest.imports";
+  static public final String INSPECT_MODE_HOTKEY_PREF = "pdex.inspectMode.hotkey";
 
 //  static volatile public boolean enableTweak = false;
 
@@ -361,6 +363,7 @@ public void loadPreferences() {
     defaultAutoSaveEnabled = Preferences.getBoolean(prefDefaultAutoSave);
     ccTriggerEnabled = Preferences.getBoolean(COMPLETION_TRIGGER_PREF);
     importSuggestEnabled = Preferences.getBoolean(SUGGEST_IMPORTS_PREF);
+    inspectModeHotkeyEnabled = Preferences.getBoolean(INSPECT_MODE_HOTKEY_PREF);
     loadSuggestionsMap();
   }
 
@@ -379,6 +382,7 @@ public void savePreferences() {
     Preferences.setBoolean(prefDefaultAutoSave, defaultAutoSaveEnabled);
     Preferences.setBoolean(COMPLETION_TRIGGER_PREF, ccTriggerEnabled);
     Preferences.setBoolean(SUGGEST_IMPORTS_PREF, importSuggestEnabled);
+    Preferences.setBoolean(INSPECT_MODE_HOTKEY_PREF, inspectModeHotkeyEnabled);
   }
 
   public void loadSuggestionsMap() {
@@ -449,6 +453,8 @@ public void ensurePrefsExist() {
       Preferences.setBoolean(COMPLETION_TRIGGER_PREF, ccTriggerEnabled);
     if (Preferences.get(SUGGEST_IMPORTS_PREF) == null)
       Preferences.setBoolean(SUGGEST_IMPORTS_PREF, importSuggestEnabled);
+    if (Preferences.get(INSPECT_MODE_HOTKEY_PREF) == null)
+      Preferences.setBoolean(INSPECT_MODE_HOTKEY_PREF, inspectModeHotkeyEnabled);
   }
 
 
diff --git a/java/src/processing/mode/java/pdex/PDEX.java b/java/src/processing/mode/java/pdex/PDEX.java
@@ -214,7 +214,8 @@ public void mousePressed(MouseEvent e) {
         public void mouseReleased(MouseEvent e) {
           boolean releasingMouse1 = e.getButton() == MouseEvent.BUTTON1;
           boolean releasingMouse2 = e.getButton() == MouseEvent.BUTTON2;
-          if (inspectModeEnabled && isMouse1Down && releasingMouse1) {
+          if (JavaMode.inspectModeHotkeyEnabled && inspectModeEnabled &&
+              isMouse1Down && releasingMouse1) {
             handleInspect(e);
           } else if (!inspectModeEnabled && isMouse2Down && releasingMouse2) {
             handleInspect(e);
