105040 Update 添加提示位置,优化按钮与布局
This commit is contained in:
parent
bbd32fa7d8
commit
f65a13f180
|
|
@ -36,6 +36,18 @@
|
|||
<RowDefinition Height="30" />
|
||||
<RowDefinition Height="30" />
|
||||
</Grid.RowDefinitions>
|
||||
<ScrollViewer
|
||||
Grid.Row="0"
|
||||
Grid.RowSpan="2"
|
||||
HorizontalAlignment="Right"
|
||||
Panel.ZIndex="99"
|
||||
VerticalScrollBarVisibility="Hidden">
|
||||
<StackPanel
|
||||
x:Name="GrowlParent"
|
||||
Margin="5"
|
||||
VerticalAlignment="Top"
|
||||
Panel.ZIndex="99" />
|
||||
</ScrollViewer>
|
||||
<hc:SimpleStackPanel Grid.Row="0" Orientation="Horizontal">
|
||||
<!--<TextBlock FontSize="14" TextWrapping="Wrap">
|
||||
<Run Text="选中的电机:" />
|
||||
|
|
@ -67,6 +79,16 @@
|
|||
hc:GridViewAttach.ColumnHeaderHeight="10"
|
||||
ItemsSource="{Binding SubLines}"
|
||||
Style="{StaticResource ListView.Small}">
|
||||
<ListView.ItemContainerStyle>
|
||||
<Style BasedOn="{StaticResource ListViewItemBaseStyle.Small}" TargetType="ListViewItem">
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding IsChecked}" Value="True">
|
||||
<Setter Property="Background" Value="#18a05d" />
|
||||
<Setter Property="Foreground" Value="White" />
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
</ListView.ItemContainerStyle>
|
||||
<ListView.View>
|
||||
<GridView>
|
||||
<GridViewColumn
|
||||
|
|
@ -106,7 +128,10 @@
|
|||
DockPanel.Dock="Right"
|
||||
IsEnabled="{Binding HasNext}"
|
||||
Style="{StaticResource ButtonPrimary}" />
|
||||
<Button DockPanel.Dock="Right" Style="{StaticResource ButtonSuccess}">
|
||||
<Button
|
||||
Click="AxisNoAndLineBtn_Click"
|
||||
DockPanel.Dock="Right"
|
||||
Style="{StaticResource ButtonSuccess}">
|
||||
<TextBlock>
|
||||
<Run Text="{Binding SelectedLine.AxisNo}" />
|
||||
<Run Text="-" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue