修正主窗体中LOG下拉框可能被撑的很大的问题。

This commit is contained in:
DESKTOP-1N1NK8A\auvkk 2023-04-19 15:46:02 +08:00
parent 06a1d44f2b
commit a9d96cf575
6 changed files with 7 additions and 56 deletions

View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Diagnostics;
using Aitex.Core.RT.Device;
using Aitex.Core.RT.Event;
using Aitex.Core.RT.Routine;
@ -29,6 +30,11 @@ namespace SicRT.Modules
public Result Start(params object[] objs)
{
if (Debugger.IsAttached)
EV.PostInfoLog("System",
"这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度");
_lstModules.Clear();
_homingModules.Clear();

View File

@ -13,13 +13,6 @@
<converters:DummyConverter x:Key="dummyConverter" />
<converters:ReversBoolValueConverter x:Key="reversBoolValueConverter" />
<SolidColorBrush x:Key="MessagesErrorForegroundBrush" Color="Red" />
<SolidColorBrush x:Key="MessagesWarningForegroundBrush" Color="#FF8C00" />
<SolidColorBrush x:Key="MessagesInformationForegroundBrush" Color="Black" />
<SolidColorBrush x:Key="MessagesInformationBackgroundBrush" Color="#FFC8E8FF" />
<SolidColorBrush x:Key="MessagesHorizontalGridLinesBrush" Color="LightGray" />
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MECF.Framework.UI.Client;component/Themes/SeaBlue/TextBox.xaml" />
<ResourceDictionary Source="pack://application:,,,/MECF.Framework.UI.Client;component/Themes/SeaBlue/Button.xaml" />

View File

@ -16,7 +16,6 @@
WindowStartupLocation="CenterScreen"
WindowState="Maximized">
<Window.Resources>
<client:DateTimeToTextConverter x:Key="dateTimeToTextConverter" />
<client:CollectionLastIndexConverter x:Key="collectionLastIndexConverter" />
<converter:UnitOnlineBorderColorConverter x:Key="UnitOnlineBorderColorConverter" />
<converter:BoolReverseConverter x:Key="BoolReverseConverter" />
@ -995,54 +994,7 @@
ItemsSource="{Binding EventLogsView}"
SelectedIndex="{Binding EventLogsView.Count, Mode=OneWay, Converter={StaticResource collectionLastIndexConverter}}"
Style="{DynamicResource Top_ComboBox}"
Visibility="{Binding AllEventsVisibility}">
<ComboBox.ItemTemplate>
<DataTemplate>
<ContentControl>
<ContentControl.Style>
<Style TargetType="ContentControl">
<Setter Property="Background" Value="{StaticResource MessagesInformationBackgroundBrush}" />
<Style.Triggers>
<DataTrigger Binding="{Binding Level}" Value="Alarm">
<Setter Property="Foreground" Value="{StaticResource MessagesErrorForegroundBrush}" />
</DataTrigger>
<DataTrigger Binding="{Binding Level}" Value="Warning">
<Setter Property="Foreground" Value="{StaticResource MessagesWarningForegroundBrush}" />
</DataTrigger>
<DataTrigger Binding="{Binding Level}" Value="Information">
<Setter Property="Foreground" Value="{StaticResource MessagesInformationForegroundBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
</ContentControl.Style>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100" />
<ColumnDefinition Width="110" />
<ColumnDefinition Width="0" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Column="0"
Margin="8,0,0,0"
Text="{Binding OccuringTime, Converter={StaticResource dateTimeToTextConverter}}" />
<TextBlock
Grid.Column="2"
Margin="8,0,0,0"
Text="{Binding Id}" />
<TextBlock
Grid.Column="1"
Margin="8,0,0,0"
Text="{Binding Source}" />
<TextBlock
Grid.Column="3"
Margin="8,0,0,0"
Text="{Binding Description}" />
</Grid>
</ContentControl>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
Visibility="{Binding AllEventsVisibility}"/>
<Label
Grid.Column="1"