Restore changes after master merge
MODIFY
WalletWasabi.Fluent/Views/Wallets/Send/SendView.axaml
WalletWasabi.Fluent/Views/Wallets/Send/SendView.axaml
NextContent="Continue"
IsBusy="{Binding IsBusy}"
ScrollViewer.VerticalScrollBarVisibility="Auto">
-
<DockPanel>
- <StackPanel DockPanel.Dock="Top" Spacing="10">
- <StackPanel.Styles>
+ <DockPanel.Styles>
<Style Selector="DockPanel > Label">
<Setter Property="MinWidth" Value="80" />
</Style>
- </StackPanel.Styles>
- <DockPanel>
+ </DockPanel.Styles>
+ <!-- To -->
+ <DockPanel DockPanel.Dock="Top" Margin="0,0,0,10">
<Label DockPanel.Dock="Left" Content="_To:" Target="toTb" />
<TextBox x:Name="toTb" MaxLength="250" Text="{Binding To}"
Watermark="(e.g. Bitcoin address or PayJoin URL)">
</TextBox.InnerRightContent>
</TextBox>
</DockPanel>
-
- <DockPanel>
+ <!-- Amount -->
+ <DockPanel DockPanel.Dock="Top" Margin="0,0,0,10">
<Label DockPanel.Dock="Left" Content="_Amount:" Target="amountTb" />
<DockPanel>
<Image Width="120" Source="avares://WalletWasabi.Fluent/Assets/TechnologyLogos/payjoin.png"
ConversionRate="{Binding ExchangeRate}" ConversionCurrencyCode="USD" />
</DockPanel>
</DockPanel>
-
- <DockPanel>
+ <!-- Labels -->
+ <DockPanel DockPanel.Dock="Top" Margin="0,0,0,10">
<Label DockPanel.Dock="Left" Content="_Labels:" Target="LabelTagBox" />
<c:TagsBox x:Name="LabelTagBox"
Watermark="{StaticResource LabelsWatermarkText}"
Items="{Binding Labels}"
Suggestions="{Binding PriorLabels}" />
</DockPanel>
+ <!-- Separator -->
<Separator DockPanel.Dock="Top"
HorizontalAlignment="Stretch"
Margin="-200 20 0 0" />
+ <!-- Priority -->
+ <DockPanel>
<Label Margin="0 10 0 20" Content="_Priority:" Target="CursorValue2" />
- </StackPanel>
-
<DockPanel MinHeight="80">
+ <DockPanel.Resources>
+ <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
+ <GridLength x:Key="SliderPreContentMargin">0</GridLength>
+ <GridLength x:Key="SliderPostContentMargin">0</GridLength>
+ </DockPanel.Resources>
<Slider x:Name="CursorValue2"
Margin="18,0,18,0"
KeyboardNavigation.IsTabStop="False"
Value="{Binding XAxisCurrentValueIndex}" />
<c:LineChart x:Name="GradientLineChart"
XAxisPlotMode="EvenlySpaced"
- Margin="18,0,18,0"
+ Margin="18,10,18,0"
Classes="cursor border xAxisLabels yAxis yAxisTitle area"
- MinHeight="30"
+ MinHeight="150"
XAxisLabels="{Binding XAxisLabels}"
XAxisValues="{Binding XAxisValues}"
XAxisCurrentValue="{Binding XAxisCurrentValue, Mode=TwoWay}"
YAxisTitle="More Expensive" />
</DockPanel>
</DockPanel>
+ </DockPanel>
</c:ContentArea>
</UserControl>
\ No newline at end of file

Restore changes after master merge