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

WIP: Features/upgrade to avalonia rc #766

Merged
merged 11 commits into from Oct 30, 2018
Merged

WIP: Features/upgrade to avalonia rc #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
477aa07
consume dock as a nuget package.
Oct 29, 2018
c513e74
update to avalonia 0.7 pre rc.
Oct 29, 2018
0d75fd1
update avalonia and use avalonia default config (gpu on windows and mac)
Oct 29, 2018
5942111
update shell with embedded font.
Oct 29, 2018
b24d565
update shell
Oct 29, 2018
f9e88ec
Merge remote-tracking branch 'origin/master' into features/upgrade-to…
Oct 29, 2018
096549c
update to avalonia rc, and adjust borders
Oct 29, 2018
aca6cc4
update avalonia and shell with critical fixes.
Oct 29, 2018
7d48080
minor polish.
Oct 29, 2018
41664d1
remove using not required
Oct 29, 2018
19cee35
avalonia update with osx input fix.
Oct 29, 2018
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
4 changes: 2 additions & 2 deletions Directory.Build.targets
View file
Open in desktop
@@ -1,8 +1,8 @@
<Project>

<PropertyGroup>
<AvaloniaVersion>0.6.2-build6379-beta</AvaloniaVersion>
<AvaloniaBehaviorsVersion>0.6.2-build520-alpha</AvaloniaBehaviorsVersion>
<AvaloniaVersion>0.7.0-build434-beta</AvaloniaVersion>
<AvaloniaBehaviorsVersion>0.6.2-build562</AvaloniaBehaviorsVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion WalletWasabi.Dependencies/AvalonStudio.Shell
Open in desktop
Submodule AvalonStudio.Shell updated 19 files
+0 −3 .gitmodules
+0 −1 Dock
+1 −4 src/AvalonStudio.Shell.Extensibility/AvalonStudio.Shell.Extensibility.csproj
+25 −23 src/AvalonStudio.Shell.Extensibility/Theme/ColorTheme.cs
+ − src/AvalonStudio.Shell/Assets/Ubuntu-Bold.ttf
+ − src/AvalonStudio.Shell/Assets/Ubuntu-BoldItalic.ttf
+ − src/AvalonStudio.Shell/Assets/Ubuntu-Italic.ttf
+ − src/AvalonStudio.Shell/Assets/Ubuntu-Light.ttf
+ − src/AvalonStudio.Shell/Assets/Ubuntu-LightItalic.ttf
+ − src/AvalonStudio.Shell/Assets/Ubuntu-Medium.ttf
+ − src/AvalonStudio.Shell/Assets/Ubuntu-MediumItalic.ttf
+ − src/AvalonStudio.Shell/Assets/Ubuntu-Regular.ttf
+3 −4 src/AvalonStudio.Shell/AvalonStudio.Shell.csproj
+1 −1 src/AvalonStudio.Shell/Controls/MetroWindowControlsTheme.paml
+1 −1 src/AvalonStudio.Shell/Controls/ModalDialog.paml
+7 −6 src/AvalonStudio.Shell/Themes/BaseDark.xaml
+4 −4 src/AvalonStudio.Shell/Themes/Scrollbar.xaml
+2 −2 src/Versions.props
+1 −0 src/nuget.config
2 changes: 1 addition & 1 deletion WalletWasabi.Gui/Controls/GroupBox.xaml
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
Content="{TemplateBinding Title}"
HorizontalAlignment="Left"
ZIndex="1" Padding="10 0 10 0" />
<Border Name="PART_Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{DynamicResource ThemeBorderDarkBrush}">
<Border Name="PART_Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{DynamicResource ThemeBorderLowBrush}">
<ContentPresenter Name="PART_ContentPresenter"
Background="{TemplateBinding Background}"
ContentTemplate="{TemplateBinding ContentTemplate}"
Expand Down
25 changes: 1 addition & 24 deletions WalletWasabi.Gui/Program.cs
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@
using NBitcoin;
using System;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using WalletWasabi.Gui.ViewModels;
using WalletWasabi.Logging;
Expand Down Expand Up @@ -66,28 +65,6 @@ private static async Task Main(string[] args)
}
}

private static AppBuilder BuildAvaloniaApp()
{
var builder = AppBuilder.Configure<App>().UseReactiveUI();

if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
builder.UseWin32().UseSkia();
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
builder.UseAvaloniaNative(null, opts=>{
opts.UseDeferredRendering = true;
opts.UseGpu = true;
opts.MacOptions.ShowInDock = true;
}).UseSkia();
}
else
{
builder.UsePlatformDetect();
}

return builder;
}
private static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<App>().UsePlatformDetect().UseReactiveUI();
}
}
8 changes: 4 additions & 4 deletions WalletWasabi.Gui/Styles/Styles.xaml
View file
Open in desktop
Expand Up @@ -64,15 +64,15 @@
</Style>

<Style Selector="ListBox">
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderDarkBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
</Style>

<Style Selector="ListBoxItem">
<Setter Property="Padding" Value="5 0" />
</Style>

<Style Selector="TextBox">
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderDarkBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
</Style>

<Style Selector="DataValidationErrors">
Expand Down Expand Up @@ -169,9 +169,9 @@
</Setter>
</Style>
<Style Selector="TextBox:pointerover /template/ Border#border">
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderDarkBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
</Style>
<Style Selector="TextBox:focus /template/ Border#border">
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderDarkBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
</Style>
</Styles>
1 change: 0 additions & 1 deletion WalletWasabi.Gui/WalletWasabi.Gui.csproj
View file
Open in desktop
Expand Up @@ -68,7 +68,6 @@

<ItemGroup>
<PackageReference Include="Avalonia.Desktop" />
<PackageReference Include="Avalonia.Native" Version="0.7.0-build4201810171" />
</ItemGroup>

<ItemGroup>
Expand Down
48 changes: 0 additions & 48 deletions WalletWasabi.sln
View file
Open in desktop
Expand Up @@ -26,14 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WalletWasabi.Gui", "WalletW
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shell", "Shell", "{3C6F150E-8435-490E-AC08-C396BD16D4E7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dock.Avalonia", "WalletWasabi.Dependencies\AvalonStudio.Shell\Dock\src\Dock.Avalonia\Dock.Avalonia.csproj", "{982B6A08-B082-4499-AD2A-148F6E0D78FA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dock.Model.ReactiveUI", "WalletWasabi.Dependencies\AvalonStudio.Shell\Dock\src\Dock.Model.ReactiveUI\Dock.Model.ReactiveUI.csproj", "{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dock.Model", "WalletWasabi.Dependencies\AvalonStudio.Shell\Dock\src\Dock.Model\Dock.Model.csproj", "{8DFA8B3F-5958-4F96-972F-BD403222BD1C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dock", "Dock", "{1F4A4316-4C10-460D-BCE1-588843D0B28A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonStudio.Utils", "WalletWasabi.Dependencies\AvalonStudio.Shell\src\AvalonStudio.Utils\AvalonStudio.Utils.csproj", "{EFC84E8A-5674-43D0-9EC6-25497CA68CF3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonStudio.Shell.Extensibility", "WalletWasabi.Dependencies\AvalonStudio.Shell\src\AvalonStudio.Shell.Extensibility\AvalonStudio.Shell.Extensibility.csproj", "{74C919FA-3EC1-49FE-B8B6-A8BF2173470D}"
Expand Down Expand Up @@ -102,42 +94,6 @@ Global
{B007DC0F-8C86-439D-BE3C-283218D8308B}.Release|x64.Build.0 = Release|Any CPU
{B007DC0F-8C86-439D-BE3C-283218D8308B}.Release|x86.ActiveCfg = Release|Any CPU
{B007DC0F-8C86-439D-BE3C-283218D8308B}.Release|x86.Build.0 = Release|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Debug|x64.ActiveCfg = Debug|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Debug|x64.Build.0 = Debug|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Debug|x86.ActiveCfg = Debug|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Debug|x86.Build.0 = Debug|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Release|Any CPU.Build.0 = Release|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Release|x64.ActiveCfg = Release|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Release|x64.Build.0 = Release|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Release|x86.ActiveCfg = Release|Any CPU
{982B6A08-B082-4499-AD2A-148F6E0D78FA}.Release|x86.Build.0 = Release|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Debug|x64.ActiveCfg = Debug|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Debug|x64.Build.0 = Debug|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Debug|x86.ActiveCfg = Debug|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Debug|x86.Build.0 = Debug|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Release|Any CPU.Build.0 = Release|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Release|x64.ActiveCfg = Release|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Release|x64.Build.0 = Release|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Release|x86.ActiveCfg = Release|Any CPU
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5}.Release|x86.Build.0 = Release|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Debug|x64.ActiveCfg = Debug|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Debug|x64.Build.0 = Debug|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Debug|x86.ActiveCfg = Debug|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Debug|x86.Build.0 = Debug|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Release|Any CPU.Build.0 = Release|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Release|x64.ActiveCfg = Release|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Release|x64.Build.0 = Release|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Release|x86.ActiveCfg = Release|Any CPU
{8DFA8B3F-5958-4F96-972F-BD403222BD1C}.Release|x86.Build.0 = Release|Any CPU
{EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFC84E8A-5674-43D0-9EC6-25497CA68CF3}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -199,10 +155,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{982B6A08-B082-4499-AD2A-148F6E0D78FA} = {1F4A4316-4C10-460D-BCE1-588843D0B28A}
{2F57A7D4-37DB-4A8C-9CC4-A103979984C5} = {1F4A4316-4C10-460D-BCE1-588843D0B28A}
{8DFA8B3F-5958-4F96-972F-BD403222BD1C} = {1F4A4316-4C10-460D-BCE1-588843D0B28A}
{1F4A4316-4C10-460D-BCE1-588843D0B28A} = {3C6F150E-8435-490E-AC08-C396BD16D4E7}
{EFC84E8A-5674-43D0-9EC6-25497CA68CF3} = {3C6F150E-8435-490E-AC08-C396BD16D4E7}
{74C919FA-3EC1-49FE-B8B6-A8BF2173470D} = {3C6F150E-8435-490E-AC08-C396BD16D4E7}
{137F0B24-7A4C-4D80-9218-43CA71793004} = {3C6F150E-8435-490E-AC08-C396BD16D4E7}
Expand Down
3 changes: 2 additions & 1 deletion nuget.config
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
<packageSources>
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
<add key="AvaloniCI" value="https://www.myget.org/F/avalonia-ci/api/v2" />
<add key="XamlBehaviors" value="https://www.myget.org/F/xamlbehaviors-nightly/api/v2" />
<add key="XamlBehaviors" value="https://www.myget.org/F/xamlbehaviors-nightly/api/v2" />
<add key="DockNightly" value="https://www.myget.org/F/dock-nightly/api/v2" />
</packageSources>
</configuration>