diff --git a/xalia/AtSpi2/DBusUtils.cs b/xalia/AtSpi2/DBusUtils.cs index 9838bb5..bcc9305 100644 --- a/xalia/AtSpi2/DBusUtils.cs +++ b/xalia/AtSpi2/DBusUtils.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using System.Threading; using System.Threading.Tasks; -using System.Windows.Documents; using Tmds.DBus.Protocol; using Xalia.Sdl; diff --git a/xalia/Util/Range.cs b/xalia/Util/RangeList.cs similarity index 89% rename from xalia/Util/Range.cs rename to xalia/Util/RangeList.cs index 0399c50..ad9cf78 100644 --- a/xalia/Util/Range.cs +++ b/xalia/Util/RangeList.cs @@ -4,9 +4,9 @@ namespace Xalia.Util { - public class Range : IList + public class RangeList : IList { - public Range(int start, int end) + public RangeList(int start, int end) { if (end < start) throw new ArgumentException($"end ({end}) must be greater than or equal to start ({start})"); @@ -82,13 +82,13 @@ IEnumerator IEnumerable.GetEnumerator() public class RangeEnumerator : IEnumerator { - public RangeEnumerator(Range range) + public RangeEnumerator(RangeList range) { Range = range; Reset(); } - public Range Range { get; } + public RangeList Range { get; } public int Current { get; set; } diff --git a/xalia/Win32/HwndListViewProvider.cs b/xalia/Win32/HwndListViewProvider.cs index 2a9ef28..d019b98 100644 --- a/xalia/Win32/HwndListViewProvider.cs +++ b/xalia/Win32/HwndListViewProvider.cs @@ -325,7 +325,7 @@ private void RefreshChildren() private void SetRecurseMethodRange(int start, int end) { - Element.SyncRecurseMethodChildren(new Range(start, end), (int key) => Connection.GetElementName(Hwnd, OBJID_CLIENT, key+1), + Element.SyncRecurseMethodChildren(new RangeList(start, end), (int key) => Connection.GetElementName(Hwnd, OBJID_CLIENT, key+1), CreateChildItem); } diff --git a/xalia/Win32/HwndTabProvider.cs b/xalia/Win32/HwndTabProvider.cs index 0a43bf3..9c0b6da 100644 --- a/xalia/Win32/HwndTabProvider.cs +++ b/xalia/Win32/HwndTabProvider.cs @@ -211,7 +211,7 @@ private void SetUiDomChildCount(int newCount) if (Element.RecurseMethodChildCount == newCount) return; - Element.SyncRecurseMethodChildren(new Range(1, newCount + 1), + Element.SyncRecurseMethodChildren(new RangeList(1, newCount + 1), (int key) => Connection.GetElementName(Hwnd, OBJID_CLIENT, key), CreateChildElement); } diff --git a/xalia/xalia-netcore.csproj b/xalia/xalia-netcore.csproj index 92e24f8..71899a1 100644 --- a/xalia/xalia-netcore.csproj +++ b/xalia/xalia-netcore.csproj @@ -37,6 +37,7 @@ + @@ -105,12 +106,8 @@ - - - - - ..\external\Tmds.Dbus\src\Tmds.DBus\bin\Release\netstandard2.0\Tmds.DBus.dll - + + diff --git a/xalia/xalia.csproj b/xalia/xalia.csproj index 4e14f43..493cf46 100644 --- a/xalia/xalia.csproj +++ b/xalia/xalia.csproj @@ -188,7 +188,7 @@ - +