Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Linux popup and flyout issues. #12497

Merged
merged 4 commits into from
Feb 20, 2024
Merged

Fix Linux popup and flyout issues. #12497

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd3b7d3
fixes, update avalonia with x11 popup fixed.
09128319047 Feb 19, 2024
d306ef4
put lifetime activation back
09128319047 Feb 19, 2024
86503a0
update version
soosr Feb 20, 2024
93d6b35
fix order
soosr Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
<Nullable>enable</Nullable>
<Deterministic>true</Deterministic>
<InvariantGlobalization>true</InvariantGlobalization>
<WarningsAsErrors>false</WarningsAsErrors>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<AvaloniaVersion>11.0.9</AvaloniaVersion>
<AvaloniaVersion>11.0.999-cibuild0044755-beta</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
<!-- AspNetCore. -->
Expand Down
10 changes: 10 additions & 0 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,15 @@
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="avalonia-all" value="https://nuget-feed-all.avaloniaui.net/v3/index.json" />
</packageSources>

<packageSourceMapping>
<packageSource key="nuget.org">
<package pattern="*"/>
</packageSource>
<packageSource key="avalonia-all">
<package pattern="Avalonia.*"/>
</packageSource>
</packageSourceMapping>
</configuration>
168 changes: 84 additions & 84 deletions WalletWasabi.Fluent.Desktop/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
"net8.0": {
"Avalonia.Desktop": {
"type": "Direct",
"requested": "[11.0.9, )",
"resolved": "11.0.9",
"contentHash": "0S2cgpkHRrtthW2Sb/7RC+xjSlMezqW0O3icoUDBKU5KIJ53Uxe+Bt4vQ6rVCZ7G8+1ZZLay2cv7uYDE519uLA==",
"requested": "[11.0.999-cibuild0044755-beta, )",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "KbriOGYPGzsuoBepErKMs+6iDGpoAkF8jgLQxYWGNCzDJ0+bcpsGN2TAQe/iXRXerD3PyZBFDuHaF2Bgobp4lQ==",
"dependencies": {
"Avalonia": "11.0.9",
"Avalonia.Native": "11.0.9",
"Avalonia.Skia": "11.0.9",
"Avalonia.Win32": "11.0.9",
"Avalonia.X11": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta",
"Avalonia.Native": "11.0.999-cibuild0044755-beta",
"Avalonia.Skia": "11.0.999-cibuild0044755-beta",
"Avalonia.Win32": "11.0.999-cibuild0044755-beta",
"Avalonia.X11": "11.0.999-cibuild0044755-beta"
}
},
"Avalonia.ReactiveUI": {
"type": "Direct",
"requested": "[11.0.9, )",
"resolved": "11.0.9",
"contentHash": "ukIv5R140jlQICrSdf/LgLWlgS8N9vPEefbfpGhtDC+vKVRguBmgI1Y55Gwy92BYl/G40bM+9rsZ2E1gftbFWA==",
"requested": "[11.0.999-cibuild0044755-beta, )",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "h/pLn83OzRBOa8apqSQtzeodPpH/IQwxsuY9nlALCaCA7sIAzeYuvYd5V2vL9UOJbcwYcFuVRRLT25UAyyd6mA==",
"dependencies": {
"Avalonia": "11.0.9",
"Avalonia": "11.0.999-cibuild0044755-beta",
"ReactiveUI": "18.3.1",
"System.Reactive": "5.0.0"
}
Expand All @@ -38,70 +38,70 @@
},
"Avalonia.Controls.ColorPicker": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "XTFV98I4zch7noJ8JntzYjbeeRGhzizh2YBTav8kP0XO/+YDZOCTok3dGJ3tqcOOU3MI2fTcAq8wX/kn6eirtA==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "VioMH3cxgJZLQw0qd2w5n5yX3ARq7TAJB/qQeIYvwk7DHOzrqZiTSRpubPy3t94F1MPOj9TyruCDZJyB4uCz6Q==",
"dependencies": {
"Avalonia": "11.0.9",
"Avalonia.Remote.Protocol": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta",
"Avalonia.Remote.Protocol": "11.0.999-cibuild0044755-beta"
}
},
"Avalonia.Controls.DataGrid": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "tueNBwc3lyhxKJMQAi4oXX3H4eZkK+GnFliUDkRYbgpAUacwO8/O6ALjvB5bpdBTqogKFhgxiviEVcfpQcbUdw==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "VqVeWO8MXJ7sDKLep4DW6onlmvBuvUSC6oL/kB7UKPFR26kfXCuIQY5l+/evApCTW020eh0daVodz2xViioVFA==",
"dependencies": {
"Avalonia": "11.0.9",
"Avalonia.Remote.Protocol": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta",
"Avalonia.Remote.Protocol": "11.0.999-cibuild0044755-beta"
}
},
"Avalonia.FreeDesktop": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "XrYQvutu6xa+yKX5G5Nqz7a+bB8Y7QCPNMT2hBn90B9RNZcPOT+onQ59sDlT3Yi90CZVo1kruEkuxZOiegMupQ==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "tA8K75PvQq7dVjIcJr83DI8fqBBJE/6rYgT90Xqi9/0KmbkNK6RI/ag4alGavKDkocjRuT/0USCAcoPdZMVElA==",
"dependencies": {
"Avalonia": "11.0.9",
"Avalonia": "11.0.999-cibuild0044755-beta",
"Tmds.DBus.Protocol": "0.15.0"
}
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "gLvGhb9JX9Po0GnBPnLNjD4U5HyRWitQeoNIygtPd4aoC8/fKIaZYHPFyKV/SttPnLLEIW2N7Wejtlc/0mGjFg==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "xp58wDqS2lnHOiL5LI8X5z9Kfc6FljSlziO41UXmHNC3R1dStQLvrd4txuu8cnbxfrKVlRH3Qfd5QDdZaQTUrg==",
"dependencies": {
"Avalonia": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta"
}
},
"Avalonia.Remote.Protocol": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "n7GXzwiVk8qIxwXcugovZnmZSi6IoCVEbL2CDu2znNH+m1m6f7JH91TbHtx1HQzG6EFAj6HEy8f/8k/8U8vQZQ=="
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "Ra8A1fD9ch3J1C/uy26oxRilhrqd66bwruA8bDDhPVrrr6LI2jFp2IP1gkC4Jgeu6SO0RiL6xL4XgZjT2i766Q=="
},
"Avalonia.Themes.Simple": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "EIp3XaorlYKZXI7MyTXMBIQkNzUs7vUzXLTE8XORXeQpz3kfmSB2TedTc19gqPFViKt/FHW8IeUOhrMrFjfSLQ==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "6Jc2fANg1L7ajZxj1WKrSZl/+ddBIHiLiBfG9aHoNSh5A3j5E5z63Hfexm77Vl3feRTlsFTE89okUtNxr35Jhw==",
"dependencies": {
"Avalonia": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta"
}
},
"Avalonia.Win32": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "wkxgAy2fFOi5k1ZqSzpaLAdPVapvP6q3N1Ho3C9pLG2K3YrigQ+CabCnhEEXN69m9tQY7C/PtsW8bX3SqzBlKA==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "JpeqMzQIP3rKIZVsgaAhmQQmC1eqb86uXgfXajCX00gOhdieG0wUzSxCL9CtlaIyz+yDK2vH3qOilIUBbWVm9g==",
"dependencies": {
"Avalonia": "11.0.9",
"Avalonia": "11.0.999-cibuild0044755-beta",
"Avalonia.Angle.Windows.Natives": "2.1.0.2023020321",
"System.Numerics.Vectors": "4.5.0"
}
},
"Avalonia.X11": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "4hdPP6++lYmQ1Uoz0qXoK0+Yewo7heXa690SUXDfUgssYs1bIQZAEHVLX8a1cQptRxecROHGslJR9qm9fSuSEw==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "gErnjCM8T0wc5w4fjZvZNSHrAC5LH9K3Occ6xd9r6rGJNKl4FWgLyryphzeeXWeya/T+csVl5o1WY5lpyxSk3A==",
"dependencies": {
"Avalonia": "11.0.9",
"Avalonia.FreeDesktop": "11.0.9",
"Avalonia.Skia": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta",
"Avalonia.FreeDesktop": "11.0.999-cibuild0044755-beta",
"Avalonia.Skia": "11.0.999-cibuild0044755-beta"
}
},
"Avalonia.Xaml.Interactions": {
Expand Down Expand Up @@ -816,13 +816,13 @@
"walletwasabi.fluent": {
"type": "Project",
"dependencies": {
"Avalonia": "[11.0.9, )",
"Avalonia": "[11.0.999-cibuild0044755-beta, )",
"Avalonia.Controls.TreeDataGrid": "[11.0.2, )",
"Avalonia.Diagnostics": "[11.0.9, )",
"Avalonia.Fonts.Inter": "[11.0.9, )",
"Avalonia.ReactiveUI": "[11.0.9, )",
"Avalonia.Skia": "[11.0.9, )",
"Avalonia.Themes.Fluent": "[11.0.9, )",
"Avalonia.Diagnostics": "[11.0.999-cibuild0044755-beta, )",
"Avalonia.Fonts.Inter": "[11.0.999-cibuild0044755-beta, )",
"Avalonia.ReactiveUI": "[11.0.999-cibuild0044755-beta, )",
"Avalonia.Skia": "[11.0.999-cibuild0044755-beta, )",
"Avalonia.Themes.Fluent": "[11.0.999-cibuild0044755-beta, )",
"Avalonia.Xaml.Behaviors": "[11.0.5, )",
"DynamicData": "[8.1.1, )",
"QRackers": "[1.1.0, )",
Expand All @@ -839,12 +839,12 @@
},
"Avalonia": {
"type": "CentralTransitive",
"requested": "[11.0.9, )",
"resolved": "11.0.9",
"contentHash": "G8cFJvcMo1pZiJVCpp6bLyumLDUskoFxfLp7n1WsTXE8WYjaBC+EyfLttWgth2+lVjiOaGHxhQ/NckltxM/Bdw==",
"requested": "[11.0.999-cibuild0044755-beta, )",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "ZClP6C+iWzmtw6EAiuTacyUgqn6qAI1x8W2au6/4JNfondFqwicD0szN7xqXwFoeGretZkqQ3yCQ5mxs0myESg==",
"dependencies": {
"Avalonia.BuildServices": "0.0.29",
"Avalonia.Remote.Protocol": "11.0.9",
"Avalonia.Remote.Protocol": "11.0.999-cibuild0044755-beta",
"MicroCom.Runtime": "0.11.0",
"System.ComponentModel.Annotations": "4.5.0"
}
Expand All @@ -861,34 +861,34 @@
},
"Avalonia.Diagnostics": {
"type": "CentralTransitive",
"requested": "[11.0.9, )",
"resolved": "11.0.9",
"contentHash": "zPB+KUsHDAGKf7pl0Mmz3mawDoDJf1wHr9wtz1XM6TRrrvxEZZYZIbkGl31yBmrCWcqVs9jhVRqWLKzfut6wqA==",
"dependencies": {
"Avalonia": "11.0.9",
"Avalonia.Controls.ColorPicker": "11.0.9",
"Avalonia.Controls.DataGrid": "11.0.9",
"Avalonia.Themes.Simple": "11.0.9",
"requested": "[11.0.999-cibuild0044755-beta, )",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "4N82CamJcRqPX3M60qZ2elyeGCf8zPmfM72ddk1hz0m4i5tVM/l2KrDQ5rergy5U2c9LD48YbDGR7q5DsZUWHA==",
"dependencies": {
"Avalonia": "11.0.999-cibuild0044755-beta",
"Avalonia.Controls.ColorPicker": "11.0.999-cibuild0044755-beta",
"Avalonia.Controls.DataGrid": "11.0.999-cibuild0044755-beta",
"Avalonia.Themes.Simple": "11.0.999-cibuild0044755-beta",
"Microsoft.CodeAnalysis.CSharp.Scripting": "3.8.0",
"Microsoft.CodeAnalysis.Common": "3.8.0"
}
},
"Avalonia.Fonts.Inter": {
"type": "CentralTransitive",
"requested": "[11.0.9, )",
"resolved": "11.0.9",
"contentHash": "0X+h5iY5KM2e4YmWqRIpkx3KgKghaoy7wm+PY8sebQLViQuwCeYPppwtrIo7kJeYu624TU6Jrl3yKZfmKuhhZQ==",
"requested": "[11.0.999-cibuild0044755-beta, )",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "ET7vbIuhDjT0DQqHi8iwytrb5oXoKSSzgamtF9Rc3aWx4dfQr2Iort3ITbTGTgWCUWZhPJwh8zgPea8nsJW3KQ==",
"dependencies": {
"Avalonia": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta"
}
},
"Avalonia.Skia": {
"type": "CentralTransitive",
"requested": "[11.0.9, )",
"resolved": "11.0.9",
"contentHash": "BDbKTimH5XuqCtlfYKEVwNEQ0PaC180xx/WMRjyablaJ+hIoAtIi03V9vRFHINKGh8s9ISSwbNWUorAIFxvGUA==",
"requested": "[11.0.999-cibuild0044755-beta, )",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "ZzLluj94hf1+pQIVrqgrKWmuMrZpyp/nwbDuJtx6NCMSR+WT128uNu4EqfFXXf/OV6c+KDAyFHxlFQQccqqTzQ==",
"dependencies": {
"Avalonia": "11.0.9",
"Avalonia": "11.0.999-cibuild0044755-beta",
"HarfBuzzSharp": "7.3.0",
"HarfBuzzSharp.NativeAssets.Linux": "7.3.0",
"HarfBuzzSharp.NativeAssets.WebAssembly": "7.3.0",
Expand All @@ -899,11 +899,11 @@
},
"Avalonia.Themes.Fluent": {
"type": "CentralTransitive",
"requested": "[11.0.9, )",
"resolved": "11.0.9",
"contentHash": "cRycTh9SZPHIi64c90xu0QI9d3jXMFY3VDWeIMHot+1Qek7Q9qYRXWmeJvStfYSYXDKOI7113IBJ7MIQiUshgg==",
"requested": "[11.0.999-cibuild0044755-beta, )",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "jsZ0feBOITYIVDWlBPkUMMht7pYLo238VlXZ8P0KHJSl1NivZ26n034RGRHKA6tNy+FMs3bXFJmFU01y2skuig==",
"dependencies": {
"Avalonia": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta"
}
},
"Avalonia.Xaml.Behaviors": {
Expand Down Expand Up @@ -1090,10 +1090,10 @@
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "gLvGhb9JX9Po0GnBPnLNjD4U5HyRWitQeoNIygtPd4aoC8/fKIaZYHPFyKV/SttPnLLEIW2N7Wejtlc/0mGjFg==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "xp58wDqS2lnHOiL5LI8X5z9Kfc6FljSlziO41UXmHNC3R1dStQLvrd4txuu8cnbxfrKVlRH3Qfd5QDdZaQTUrg==",
"dependencies": {
"Avalonia": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta"
}
},
"HarfBuzzSharp.NativeAssets.Linux": {
Expand Down Expand Up @@ -1503,10 +1503,10 @@
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "gLvGhb9JX9Po0GnBPnLNjD4U5HyRWitQeoNIygtPd4aoC8/fKIaZYHPFyKV/SttPnLLEIW2N7Wejtlc/0mGjFg==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "xp58wDqS2lnHOiL5LI8X5z9Kfc6FljSlziO41UXmHNC3R1dStQLvrd4txuu8cnbxfrKVlRH3Qfd5QDdZaQTUrg==",
"dependencies": {
"Avalonia": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta"
}
},
"HarfBuzzSharp.NativeAssets.Linux": {
Expand Down Expand Up @@ -1916,10 +1916,10 @@
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "gLvGhb9JX9Po0GnBPnLNjD4U5HyRWitQeoNIygtPd4aoC8/fKIaZYHPFyKV/SttPnLLEIW2N7Wejtlc/0mGjFg==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "xp58wDqS2lnHOiL5LI8X5z9Kfc6FljSlziO41UXmHNC3R1dStQLvrd4txuu8cnbxfrKVlRH3Qfd5QDdZaQTUrg==",
"dependencies": {
"Avalonia": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta"
}
},
"HarfBuzzSharp.NativeAssets.Linux": {
Expand Down Expand Up @@ -2329,10 +2329,10 @@
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "gLvGhb9JX9Po0GnBPnLNjD4U5HyRWitQeoNIygtPd4aoC8/fKIaZYHPFyKV/SttPnLLEIW2N7Wejtlc/0mGjFg==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "xp58wDqS2lnHOiL5LI8X5z9Kfc6FljSlziO41UXmHNC3R1dStQLvrd4txuu8cnbxfrKVlRH3Qfd5QDdZaQTUrg==",
"dependencies": {
"Avalonia": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta"
}
},
"HarfBuzzSharp.NativeAssets.Linux": {
Expand Down Expand Up @@ -2742,10 +2742,10 @@
},
"Avalonia.Native": {
"type": "Transitive",
"resolved": "11.0.9",
"contentHash": "gLvGhb9JX9Po0GnBPnLNjD4U5HyRWitQeoNIygtPd4aoC8/fKIaZYHPFyKV/SttPnLLEIW2N7Wejtlc/0mGjFg==",
"resolved": "11.0.999-cibuild0044755-beta",
"contentHash": "xp58wDqS2lnHOiL5LI8X5z9Kfc6FljSlziO41UXmHNC3R1dStQLvrd4txuu8cnbxfrKVlRH3Qfd5QDdZaQTUrg==",
"dependencies": {
"Avalonia": "11.0.9"
"Avalonia": "11.0.999-cibuild0044755-beta"
}
},
"HarfBuzzSharp.NativeAssets.Linux": {
Expand Down
1 change: 0 additions & 1 deletion WalletWasabi.Fluent/ApplicationStateManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
using WalletWasabi.Fluent.Views;
using WalletWasabi.Logging;
using WalletWasabi.Services;
using WalletWasabi.Services.Terminate;

namespace WalletWasabi.Fluent;

Expand Down