r7310@daniel-notebook (orig r3341): daniel | 2008-08-14 10:13:19 +0200

Don't show tooltips when code-completion is disabled.


git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3343 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs

@@ -308,6 +308,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
 				TextArea textArea = (TextArea)sender;
 				if (e.ToolTipShown) return;
 				if (oldToolTipControl != null && !oldToolTipControl.AllowClose) return;
+				if (!CodeCompletionOptions.EnableCodeCompletion) return;
 				if (!CodeCompletionOptions.TooltipsEnabled) return;
 				
 				if (CodeCompletionOptions.TooltipsOnlyWhenDebugging) {

src/Main/Base/Project/Src/Services/ParserService/CodeCompletionOptions.cs

@@ -23,31 +23,22 @@ namespace ICSharpCode.SharpDevelop
 			}
 		}
 		
+		/// <summary>
+		/// Global option to turn all code-completion-related features off.
+		/// </summary>
 		public static bool EnableCodeCompletion {
-			get {
-				return properties.Get("EnableCC", true);
-			}
-			set {
-				properties.Set("EnableCC", value);
-			}
+			get { return properties.Get("EnableCC", true); }
+			set { properties.Set("EnableCC", value); }
 		}
 		
 		public static bool DataUsageCacheEnabled {
-			get {
-				return properties.Get("DataUsageCacheEnabled", true);
-			}
-			set {
-				properties.Set("DataUsageCacheEnabled", value);
-			}
+			get { return properties.Get("DataUsageCacheEnabled", true); }
+			set { properties.Set("DataUsageCacheEnabled", value); }
 		}
 		
 		public static int DataUsageCacheItemCount {
-			get {
-				return properties.Get("DataUsageCacheItemCount", 500);
-			}
-			set {
-				properties.Set("DataUsageCacheItemCount", value);
-			}
+			get { return properties.Get("DataUsageCacheItemCount", 500); }
+			set { properties.Set("DataUsageCacheItemCount", value); }
 		}
 		
 		public static bool TooltipsEnabled {