Browse Source

some UI improvements in tooltips:

- use Editor font size
- reduce padding in insight tooltip
- do not use fully qualified names in completion documentation
newNR
Siegfried Pammer 12 years ago
parent
commit
8b0fbd2f16
  1. 5
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpInsightItem.cs
  2. 5
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/EntityCompletionData.cs
  3. 5
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/TypeCompletionData.cs
  4. 1
      src/Main/Base/Project/Editor/DocumentationUIBuilder.cs
  5. 12
      src/Main/Base/Project/Editor/XmlDocFormatter.cs

5
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/CSharpInsightItem.cs

@ -79,8 +79,11 @@ namespace CSharpBinding.Completion
VerticalScrollBarVisibility = ScrollBarVisibility.Auto VerticalScrollBarVisibility = ScrollBarVisibility.Auto
}; };
var flowDocument = b.CreateFlowDocument();
flowDocument.PagePadding = new Thickness(0); // default is NOT Thickness(0), but Thickness(Auto), which adds unnecessary space
return new FlowDocumentScrollViewer { return new FlowDocumentScrollViewer {
Document = b.CreateFlowDocument(), Document = flowDocument,
VerticalScrollBarVisibility = ScrollBarVisibility.Auto VerticalScrollBarVisibility = ScrollBarVisibility.Auto
}; };
} }

5
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/EntityCompletionData.cs

@ -29,9 +29,8 @@ namespace CSharpBinding.Completion
protected override object CreateFancyDescription() protected override object CreateFancyDescription()
{ {
return new FlowDocumentScrollViewer { return new FlowDocumentScrollViewer {
Document = XmlDocFormatter.CreateTooltip(entity), Document = XmlDocFormatter.CreateTooltip(entity, false),
VerticalScrollBarVisibility = ScrollBarVisibility.Auto, VerticalScrollBarVisibility = ScrollBarVisibility.Auto
FontSize = SD.EditorControlService.GlobalOptions.FontSize
}; };
} }
} }

5
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/TypeCompletionData.cs

@ -29,9 +29,8 @@ namespace CSharpBinding.Completion
protected override object CreateFancyDescription() protected override object CreateFancyDescription()
{ {
return new FlowDocumentScrollViewer { return new FlowDocumentScrollViewer {
Document = XmlDocFormatter.CreateTooltip(type), Document = XmlDocFormatter.CreateTooltip(type, false),
VerticalScrollBarVisibility = ScrollBarVisibility.Auto, VerticalScrollBarVisibility = ScrollBarVisibility.Auto
FontSize = SD.EditorControlService.GlobalOptions.FontSize
}; };
} }
} }

1
src/Main/Base/Project/Editor/DocumentationUIBuilder.cs

@ -50,6 +50,7 @@ namespace ICSharpCode.SharpDevelop.Editor
public FlowDocument CreateFlowDocument() public FlowDocument CreateFlowDocument()
{ {
FlushAddedText(true); FlushAddedText(true);
flowDocument.FontSize = SD.EditorControlService.GlobalOptions.FontSize;
return flowDocument; return flowDocument;
} }

12
src/Main/Base/Project/Editor/XmlDocFormatter.cs

@ -13,10 +13,12 @@ namespace ICSharpCode.SharpDevelop.Editor
/// </summary> /// </summary>
public static class XmlDocFormatter public static class XmlDocFormatter
{ {
public static FlowDocument CreateTooltip(IType type) public static FlowDocument CreateTooltip(IType type, bool useFullyQualifiedMemberNames = true)
{ {
var ambience = AmbienceService.GetCurrentAmbience(); var ambience = AmbienceService.GetCurrentAmbience();
ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedMemberNames; ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType;
if (useFullyQualifiedMemberNames)
ambience.ConversionFlags |= ConversionFlags.UseFullyQualifiedMemberNames;
string header; string header;
if (type is ITypeDefinition) if (type is ITypeDefinition)
header = ambience.ConvertEntity((ITypeDefinition)type); header = ambience.ConvertEntity((ITypeDefinition)type);
@ -39,10 +41,12 @@ namespace ICSharpCode.SharpDevelop.Editor
return b.CreateFlowDocument(); return b.CreateFlowDocument();
} }
public static FlowDocument CreateTooltip(IEntity entity) public static FlowDocument CreateTooltip(IEntity entity, bool useFullyQualifiedMemberNames = true)
{ {
var ambience = AmbienceService.GetCurrentAmbience(); var ambience = AmbienceService.GetCurrentAmbience();
ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedMemberNames; ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType;
if (useFullyQualifiedMemberNames)
ambience.ConversionFlags |= ConversionFlags.UseFullyQualifiedMemberNames;
string header = ambience.ConvertEntity(entity); string header = ambience.ConvertEntity(entity);
var documentation = XmlDocumentationElement.Get(entity); var documentation = XmlDocumentationElement.Get(entity);

Loading…
Cancel
Save