Fix cursors, and update Avalonia

This commit is contained in:
Jeffrey Ye 2018-10-04 16:06:04 -07:00
Родитель aae09de35e
Коммит 051832b370
4 изменённых файлов: 12 добавлений и 7 удалений

@ -1 +1 @@
Subproject commit 5739e6af4c166f55bfd3e54638158100533cb3fc
Subproject commit 6f3e02ec0c2c2e0a497df02a12fe47f4c8c9207a

Просмотреть файл

@ -33,7 +33,7 @@
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="NuGet.Client" Version="4.2.0" />
<PackageReference Include="Microsoft.DiaSymReader" Version="1.3.0" />
<PackageReference Include="Avalonia" Version="0.6.2-build6122-beta" />
<PackageReference Include="Avalonia" Version="0.6.2-build6140-beta" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -84,7 +84,9 @@ namespace ICSharpCode.ILSpy.TextView
/// </summary>
sealed class VisualLineReferenceText : VisualLineText
{
readonly ReferenceElementGenerator parent;
private static readonly Cursor HandCursor = new Cursor(StandardCursorType.Hand);
readonly ReferenceElementGenerator parent;
readonly ReferenceSegment referenceSegment;
/// <summary>
@ -102,9 +104,12 @@ namespace ICSharpCode.ILSpy.TextView
protected override void OnQueryCursor(PointerEventArgs e)
{
e.Handled = true;
// TODO: cursor
//e.Cursor = referenceSegment.IsLocal ? Cursors.Arrow : Cursors.Hand;
}
if (e.Source is InputElement inputElement)
{
inputElement.Cursor = referenceSegment.IsLocal ? Cursor.Default : HandCursor;
}
}
/// <inheritdoc/>
protected override VisualLineText CreateInstance(int length)

Просмотреть файл

@ -59,6 +59,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="0.6.2-build6122-beta" />
<PackageReference Include="Avalonia.Desktop" Version="0.6.2-build6140-beta" />
</ItemGroup>
</Project>