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.

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

Xaml fixes #2109

Merged
merged 6 commits into from Aug 12, 2019
Merged

Xaml fixes #2109

Changes from 5 commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -8,11 +8,11 @@

namespace WalletWasabi.Gui.Behaviors
{
internal class BindSelectedTextBehavior : Behavior<TextBox>
public class BindSelectedTextBehavior : Behavior<TextBox>
{
private CompositeDisposable Disposables { get; } = new CompositeDisposable();

private static readonly AvaloniaProperty<string> SelectedTextProperty =
public static readonly AvaloniaProperty<string> SelectedTextProperty =
AvaloniaProperty.Register<BindSelectedTextBehavior, string>(nameof(SelectedText), defaultBindingMode: BindingMode.TwoWay);

public string SelectedText
@@ -5,7 +5,7 @@

namespace WalletWasabi.Gui.Behaviors
{
internal class CommandOnFirstVisible : CommandBasedBehavior<InputElement>
public class CommandOnFirstVisible : CommandBasedBehavior<InputElement>
{
private CompositeDisposable Disposables { get; set; }

@@ -8,7 +8,7 @@

namespace WalletWasabi.Gui.Behaviors
{
internal class CommandOnLostFocusBehavior : CommandBasedBehavior<Control>
public class CommandOnLostFocusBehavior : CommandBasedBehavior<Control>
{
private CompositeDisposable Disposables { get; set; }

@@ -4,7 +4,7 @@

namespace WalletWasabi.Gui.Behaviors
{
internal class CommandOnPointerEnterLeaveBehavior : CommandBasedBehavior<Control>
public class CommandOnPointerEnterLeaveBehavior : CommandBasedBehavior<Control>
{
private CompositeDisposable Disposables { get; set; }

@@ -7,11 +7,11 @@

namespace WalletWasabi.Gui.Behaviors
{
internal class FocusBehavior : Behavior<Control>
public class FocusBehavior : Behavior<Control>
{
private CompositeDisposable Disposables { get; } = new CompositeDisposable();

private static readonly AvaloniaProperty<bool> IsFocusedProperty =
public static readonly AvaloniaProperty<bool> IsFocusedProperty =
AvaloniaProperty.Register<FocusBehavior, bool>(nameof(IsFocused), defaultBindingMode: BindingMode.TwoWay);

public bool IsFocused
@@ -16,7 +16,7 @@

namespace WalletWasabi.Gui.Behaviors
{
internal class PasteAddressOnClickBehavior : CommandBasedBehavior<TextBox>
public class PasteAddressOnClickBehavior : CommandBasedBehavior<TextBox>
{
private CompositeDisposable Disposables { get; set; }
private Global Global { get; }
@@ -12,11 +12,11 @@

namespace WalletWasabi.Gui.Behaviors
{
internal class SuggestionBehavior : Behavior<TextBox>
public class SuggestionBehavior : Behavior<TextBox>
{
private CompositeDisposable Disposables { get; set; }

private static readonly AvaloniaProperty<IEnumerable<SuggestionViewModel>> SuggestionItemsProperty =
public static readonly AvaloniaProperty<IEnumerable<SuggestionViewModel>> SuggestionItemsProperty =
AvaloniaProperty.Register<SuggestionBehavior, IEnumerable<SuggestionViewModel>>(nameof(SuggestionItems), defaultBindingMode: BindingMode.TwoWay);

public IEnumerable<SuggestionViewModel> SuggestionItems
@@ -1,6 +1,6 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui">
<Style Selector="local|BusyIndicator">
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
@@ -1,4 +1,5 @@
<Styles xmlns="https://github.com/avaloniaui"
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cont="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui">
<Style Selector="cont|EditableTextBlock">
<Setter Property="BorderThickness" Value="0" />
@@ -1,6 +1,6 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui">
<Style Selector="local|GroupBox">
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
<Setter Property="BorderThickness" Value="1" />
@@ -1,6 +1,7 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:lockscreen="clr-namespace:WalletWasabi.Gui.Controls.LockScreen;assembly=WalletWasabi.Gui"
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:lockscreen="clr-namespace:WalletWasabi.Gui.Controls.LockScreen;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.LockScreen.LockScreen"
IsHitTestVisible="{Binding IsLocked}">
<UserControl.DataTemplates>
<DataTemplate DataType="{x:Type lockscreen:PinLockScreenViewModel}">
@@ -1,7 +1,8 @@
<lockscreen:PinLockScreen xmlns="https://github.com/avaloniaui"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:lockscreen="clr-namespace:WalletWasabi.Gui.Controls.LockScreen;assembly=WalletWasabi.Gui"
<lockscreen:PinLockScreen xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:lockscreen="clr-namespace:WalletWasabi.Gui.Controls.LockScreen;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.LockScreen.PinLockScreen"
IsLocked="{Binding IsLocked}">
<lockscreen:PinLockScreen.Styles>
<Style Selector="Grid.Shade">
@@ -1,6 +1,7 @@
<lockscreen:SlideLockScreen xmlns="https://github.com/avaloniaui"
xmlns:lockscreen="clr-namespace:WalletWasabi.Gui.Controls.LockScreen;assembly=WalletWasabi.Gui"
<lockscreen:SlideLockScreen xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:lockscreen="clr-namespace:WalletWasabi.Gui.Controls.LockScreen;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.LockScreen.SlideLockScreen"
IsLocked="{Binding IsLocked}"
Offset="{Binding Offset}">
<lockscreen:SlideLockScreen.Clock>
@@ -1,5 +1,7 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:cont="clr-namespace:AvalonStudio.Controls;assembly=AvalonStudio.Shell.Extensibility">
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cont="clr-namespace:AvalonStudio.Controls;assembly=AvalonStudio.Shell.Extensibility"
x:Class="WalletWasabi.Gui.Controls.ModalDialog">
<Grid Background="#EF2D2D2D" IsVisible="{Binding IsVisible, FallbackValue=False}">
<Grid Height="500" Background="{DynamicResource ThemeControlBackgroundBrush}" Margin="10 0">
<DockPanel LastChildFill="True" Margin="200 0 200 100">
@@ -1,5 +1,5 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity">
@@ -1,5 +1,5 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui">
<Style Selector="controls|NoparaPasswordBox">
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
@@ -1,4 +1,6 @@
<UserControl xmlns="https://github.com/avaloniaui">
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="WalletWasabi.Gui.Controls.Spinner">
<Grid>
<Grid.Styles>
<Style Selector="DrawingPresenter">
@@ -1,8 +1,9 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui" Height="25">
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.StatusBar" Height="25">
<UserControl.Resources>
<converters:FilterLeftStatusConverter x:Key="FilterLeftStatusConverter" />
<converters:StatusColorConverter x:Key="StatusColorConverter" />
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls.WalletExplorer;assembly=WalletWasabi.Gui">
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls.WalletExplorer;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.CoinJoinTabView">
<UserControl.Resources>
<converters:CoinJoinedVisibilityConverter x:Key="CoinJoinedVisibilityConverter" />
<converters:MoneyStringConverter x:Key="MoneyStringConverter" />
@@ -1,9 +1,10 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui">
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.CoinListView">
<UserControl.Resources>
<converters:PrivacyLevelValueConverter x:Key="PrivacyLevelValueConverter" />
<converters:CoinStatusStringConverter x:Key="CoinStatusStringConverter" />
@@ -3,7 +3,8 @@
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui">
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.HistoryTabView">
<i:Interaction.Behaviors>
<behaviors:ClearPropertyOnLostFocusBehavior TargetProperty="{Binding SelectedTransaction}" />
</i:Interaction.Behaviors>
@@ -1,9 +1,10 @@
<UserControl x:Class="WalletWasabi.Gui.Controls.WalletExplorer.PinPadView"
xmlns="https://github.com/avaloniaui"
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui">
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.PinPadView"
This conversation was marked as resolved by nopara73

This comment has been minimized.

Copy link
@lontivero

lontivero Aug 11, 2019

Collaborator

I don't understand this addition.

This comment has been minimized.

Copy link
@lontivero

lontivero Aug 11, 2019

Collaborator

Forget it. I got it.

mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450">
<controls:GroupBox Title="{Binding Title}" TextBlock.FontSize="30" Padding="20" Margin="10">
<DockPanel LastChildFill="True">
<controls:NoparaPasswordBox DockPanel.Dock="Top" Margin="4 0 4 20" Password="{Binding MaskedPin}" Watermark="PIN" UseFloatingWatermark="True"></controls:NoparaPasswordBox>
@@ -4,7 +4,8 @@
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:iac="clr-namespace:Avalonia.Xaml.Interactions.Custom;assembly=Avalonia.Xaml.Interactions.Custom"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui" Name="ReceiveTabViewerUserControl">
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.ReceiveTabView">
<UserControl.Resources>
<converters:CoinItemExpanderColorConverter x:Key="CoinItemExpanderColorConverter" />
<converters:LurkingWifeModeStringConverter x:Key="LurkingWifeModeStringConverter" />
@@ -1,11 +1,12 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:iac="clr-namespace:Avalonia.Xaml.Interactions.Custom;assembly=Avalonia.Xaml.Interactions.Custom"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls.WalletExplorer;assembly=WalletWasabi.Gui">
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls.WalletExplorer;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.SendTabView">
<UserControl.Resources>
<converters:AmountForegroundConverter x:Key="AmountForegroundConverter" />
<converters:BooleanStringConverter x:Key="BooleanStringConverter" />
@@ -1,5 +1,4 @@
<UserControl x:Class="WalletWasabi.Gui.Controls.WalletExplorer.TransactionBroadcasterView"
xmlns="https://github.com/avaloniaui"
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -8,7 +7,9 @@
xmlns:iac="clr-namespace:Avalonia.Xaml.Interactions.Custom;assembly=Avalonia.Xaml.Interactions.Custom"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls.WalletExplorer;assembly=WalletWasabi.Gui" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450">
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls.WalletExplorer;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.TransactionBroadcasterView"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450">
<controls:GroupBox Title="{Binding Title}" TextBlock.FontSize="30" Padding="20" Margin="10">
<Grid Classes="content">
<DockPanel LastChildFill="True">
@@ -1,12 +1,12 @@
<UserControl x:Class="WalletWasabi.Gui.Controls.WalletExplorer.TransactionViewerView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:iac="clr-namespace:Avalonia.Xaml.Interactions.Custom;assembly=Avalonia.Xaml.Interactions.Custom"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
xmlns:local="clr-namespace:WalletWasabi.Gui.Controls.WalletExplorer;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.TransactionViewerView"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450">
<UserControl.Resources>
<converters:LurkingWifeModeStringConverter x:Key="LurkingWifeModeStringConverter" />
@@ -1,5 +1,7 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:ViewModels="clr-namespace:WalletWasabi.Gui.Controls.WalletExplorer;assembly=WalletWasabi.Gui">
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ViewModels="clr-namespace:WalletWasabi.Gui.Controls.WalletExplorer;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.WalletExplorerView">
<Grid>
<TreeView BorderThickness="0" Items="{Binding Wallets}" SelectedItem="{Binding SelectedItem}">
<TreeView.Styles>
@@ -3,7 +3,8 @@
xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
xmlns:behaviors="clr-namespace:WalletWasabi.Gui.Behaviors;assembly=WalletWasabi.Gui"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui"
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui">
xmlns:converters="clr-namespace:WalletWasabi.Gui.Converters;assembly=WalletWasabi.Gui"
x:Class="WalletWasabi.Gui.Controls.WalletExplorer.WalletInfoView">
<UserControl.Resources>
<converters:LurkingWifeModeStringConverter x:Key="LurkingWifeModeStringConverter" />
<converters:BooleanStringConverter x:Key="BooleanStringConverter" />
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.