Browse Source

Fixed exception when hovering mouse outside of document.

Fixed exception when menu has no subitems.
Fixed opening options dialog.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3923 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
fd03921b13
  1. 6
      src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
  2. 3
      src/AddIns/Misc/ResourceToolkit/Project/Src/ToolTips/ResourceToolTipProvider.cs
  3. 2
      src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
  4. 6
      src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs

6
src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin

@ -70,12 +70,12 @@ @@ -70,12 +70,12 @@
</Path>
<Path name="/SharpDevelop/Dialogs/OptionsDialog">
<DialogPanel id = "Profiling"
<OptionPanel id = "Profiling"
label = "${res:Dialog.Options.IDEOptions.Profiling}"
insertbefore = "TextEditorOptions">
<DialogPanel id = "General"
<OptionPanel id = "General"
label = "${res:Dialog.Options.IDEOptions.Profiling.General}"
class = "ICSharpCode.Profiler.AddIn.OptionsPanels.General"/>
</DialogPanel>
</OptionPanel>
</Path>
</AddIn>

3
src/AddIns/Misc/ResourceToolkit/Project/Src/ToolTips/ResourceToolTipProvider.cs

@ -23,6 +23,9 @@ namespace Hornung.ResourceToolkit.ToolTips @@ -23,6 +23,9 @@ namespace Hornung.ResourceToolkit.ToolTips
{
public void HandleToolTipRequest(ToolTipRequestEventArgs e)
{
if (!e.InDocument)
return;
Location logicPos = e.LogicalPosition;
IDocument doc = e.Editor.Document;
if (logicPos.X > doc.GetLine(logicPos.Y).Length) {

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

@ -295,6 +295,8 @@ namespace ICSharpCode.SharpDevelop.Debugging @@ -295,6 +295,8 @@ namespace ICSharpCode.SharpDevelop.Debugging
/// </summary>
internal static void HandleToolTipRequest(ToolTipRequestEventArgs e)
{
if (!e.InDocument)
return;
Location logicPos = e.LogicalPosition;
var doc = e.Editor.Document;
IExpressionFinder expressionFinder = ParserService.GetExpressionFinder(e.Editor.FileName);

6
src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs

@ -78,8 +78,10 @@ namespace ICSharpCode.Core.Presentation @@ -78,8 +78,10 @@ namespace ICSharpCode.Core.Presentation
internal static IList CreateMenuItems(UIElement inputBindingOwner, IEnumerable descriptors)
{
ArrayList result = new ArrayList();
foreach (MenuItemDescriptor descriptor in descriptors) {
result.Add(CreateMenuItemFromDescriptor(inputBindingOwner, descriptor));
if (descriptors != null) {
foreach (MenuItemDescriptor descriptor in descriptors) {
result.Add(CreateMenuItemFromDescriptor(inputBindingOwner, descriptor));
}
}
return result;
}

Loading…
Cancel
Save