fyf
2 роки тому
1 змінених файлів з 4 додано та 4 видалено
Об'єднаний перегляд
Параметри порівняння
+ 4
- 4
BPASmartClient.SCADAControl/Themes/Generic.xaml
Переглянути файл
| @@ -1656,7 +1656,7 @@ | |||||
| FontFamily="Fonts/#Quartz M" | FontFamily="Fonts/#Quartz M" | ||||
| FontSize="20" | FontSize="20" | ||||
| Foreground="{DynamicResource ProgressBar.Progress.圆形蓝.Text}" | Foreground="{DynamicResource ProgressBar.Progress.圆形蓝.Text}" | ||||
| Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}" /> | |||||
| Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:f1}%}" /> | |||||
| </Grid> | </Grid> | ||||
| <ControlTemplate.Triggers> | <ControlTemplate.Triggers> | ||||
| <EventTrigger RoutedEvent="Loaded"> | <EventTrigger RoutedEvent="Loaded"> | ||||
| @@ -1745,7 +1745,7 @@ | |||||
| FontFamily="Fonts/#Quartz M" | FontFamily="Fonts/#Quartz M" | ||||
| FontSize="20" | FontSize="20" | ||||
| Foreground="{DynamicResource ProgressBar.Progress.圆形绿.Text}" | Foreground="{DynamicResource ProgressBar.Progress.圆形绿.Text}" | ||||
| Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}" /> | |||||
| Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:f1}%}" /> | |||||
| </Grid> | </Grid> | ||||
| <ControlTemplate.Triggers> | <ControlTemplate.Triggers> | ||||
| <EventTrigger RoutedEvent="Loaded"> | <EventTrigger RoutedEvent="Loaded"> | ||||
| @@ -1834,7 +1834,7 @@ | |||||
| FontFamily="Fonts/#Quartz M" | FontFamily="Fonts/#Quartz M" | ||||
| FontSize="20" | FontSize="20" | ||||
| Foreground="{DynamicResource ProgressBar.Progress.圆形红.Text}" | Foreground="{DynamicResource ProgressBar.Progress.圆形红.Text}" | ||||
| Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}" /> | |||||
| Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:f1}%}" /> | |||||
| </Grid> | </Grid> | ||||
| <ControlTemplate.Triggers> | <ControlTemplate.Triggers> | ||||
| <EventTrigger RoutedEvent="Loaded"> | <EventTrigger RoutedEvent="Loaded"> | ||||
| @@ -1920,7 +1920,7 @@ | |||||
| FontFamily="{StaticResource Digital}" | FontFamily="{StaticResource Digital}" | ||||
| FontSize="12" | FontSize="12" | ||||
| Foreground="{DynamicResource Titleforeground}" | Foreground="{DynamicResource Titleforeground}" | ||||
| Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Value, StringFormat={}百分比: {0} %}" | |||||
| Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Value, StringFormat={}百分比: {0:f2} %}" | |||||
| Visibility="Visible" /> | Visibility="Visible" /> | ||||
| <VisualStateManager.VisualStateGroups> | <VisualStateManager.VisualStateGroups> | ||||
| <VisualStateGroup x:Name="CommonStates"> | <VisualStateGroup x:Name="CommonStates"> | ||||