Browse Source

- debugger tooltips - changed return type of IDebugger.GetTooltipControl to System.Object

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4484 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Martin Koníček 16 years ago
parent
commit
131cfee89d
  1. 20
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
  2. 2
      src/Main/Base/Project/Src/Services/Debugger/DefaultDebugger.cs
  3. 2
      src/Main/Base/Project/Src/Services/Debugger/IDebugger.cs

20
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs

@ -79,8 +79,8 @@ namespace ICSharpCode.SharpDevelop.Services
Process debuggedProcess; Process debuggedProcess;
DynamicTreeDebuggerRow currentTooltipRow; //DynamicTreeDebuggerRow currentTooltipRow;
Expression currentTooltipExpression; //Expression currentTooltipExpression;
public event EventHandler<ProcessEventArgs> ProcessSelected; public event EventHandler<ProcessEventArgs> ProcessSelected;
@ -379,7 +379,7 @@ namespace ICSharpCode.SharpDevelop.Services
/// Gets the tooltip control that shows the value of given variable. /// Gets the tooltip control that shows the value of given variable.
/// Return null if no tooltip is available. /// Return null if no tooltip is available.
/// </summary> /// </summary>
public DebuggerGridControl GetTooltipControl(string variableName) public object GetTooltipControl(string variableName)
{ {
ValueNode valueNode; ValueNode valueNode;
try { try {
@ -390,13 +390,14 @@ namespace ICSharpCode.SharpDevelop.Services
return null; return null;
} }
try { /*try {
currentTooltipRow = new DynamicTreeDebuggerRow(DebuggedProcess, valueNode); currentTooltipRow = new DynamicTreeDebuggerRow(DebuggedProcess, valueNode);
} catch (AbortedBecauseDebuggeeResumedException) { } catch (AbortedBecauseDebuggeeResumedException) {
return null; return null;
} }*/
currentTooltipExpression = valueNode.Expression; //currentTooltipExpression = valueNode.Expression;
return new DebuggerGridControl(currentTooltipRow); //return new DebuggerGridControl(currentTooltipRow);
return valueNode.Expression + " = " + valueNode.Text + ", type: " + valueNode.Type;
} }
public bool CanSetInstructionPointer(string filename, int line, int column) public bool CanSetInstructionPointer(string filename, int line, int column)
@ -633,7 +634,8 @@ namespace ICSharpCode.SharpDevelop.Services
using(new PrintTimes("Jump to current line")) { using(new PrintTimes("Jump to current line")) {
JumpToCurrentLine(); JumpToCurrentLine();
} }
if (currentTooltipRow != null && currentTooltipRow.IsShown) { // TODO update tooltip
/*if (currentTooltipRow != null && currentTooltipRow.IsShown) {
using(new PrintTimes("Update tooltip")) { using(new PrintTimes("Update tooltip")) {
try { try {
Utils.DoEvents(debuggedProcess); Utils.DoEvents(debuggedProcess);
@ -642,7 +644,7 @@ namespace ICSharpCode.SharpDevelop.Services
} catch (AbortedBecauseDebuggeeResumedException) { } catch (AbortedBecauseDebuggeeResumedException) {
} }
} }
} }*/
} }
void debuggedProcess_DebuggingResumed(object sender, ProcessEventArgs e) void debuggedProcess_DebuggingResumed(object sender, ProcessEventArgs e)

2
src/Main/Base/Project/Src/Services/Debugger/DefaultDebugger.cs

@ -130,7 +130,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
/// Gets the tooltip control that shows the value of given variable. /// Gets the tooltip control that shows the value of given variable.
/// Return null if no tooltip is available. /// Return null if no tooltip is available.
/// </summary> /// </summary>
public DebuggerGridControl GetTooltipControl(string variable) public object GetTooltipControl(string variable)
{ {
return null; return null;
} }

2
src/Main/Base/Project/Src/Services/Debugger/IDebugger.cs

@ -77,7 +77,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
/// Gets the tooltip control that shows the value of given variable. /// Gets the tooltip control that shows the value of given variable.
/// Return null if no tooltip is available. /// Return null if no tooltip is available.
/// </summary> /// </summary>
DebuggerGridControl GetTooltipControl(string variable); object GetTooltipControl(string variable);
/// <summary> /// <summary>
/// Queries the debugger whether it is possible to set the instruction pointer to a given position. /// Queries the debugger whether it is possible to set the instruction pointer to a given position.

Loading…
Cancel
Save