Sic-Software
/
Sic.Framework-Nanjing-Baishi
4
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

[UI.Client] 

1修改对比界面布局
2修改双界面同时拖动存在的BUG
This commit is contained in:
hanqiangqiang 2023-10-06 20:53:33 +08:00
parent 378ce6a781
commit acf4a20fc0
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
MECF.Framework.UI.Client/CenterViews/Editors/Recipe/RecipeComparisonView.xaml
View File

@ -57,10 +57,6 @@
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="80" />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250" />
<ColumnDefinition />
@ -68,19 +64,11 @@
<StackPanel Orientation="Horizontal">
<Button
Width="70"
Height="35"
Margin="3"
micro:Message.Attach="ComperSelectRecipe()"
Content="Comper"
FontSize="13"
IsEnabled="{Binding IsSelectButtonEnable}" />
</StackPanel>
<StackPanel
Grid.Row="1"
Width="250"
HorizontalAlignment="Left">
<Border
@ -156,14 +144,23 @@
</Grid>
</Border>
<Button
Width="70"
Height="35"
Margin="10"
HorizontalAlignment="Left"
micro:Message.Attach="ComperSelectRecipe()"
Content="Comper"
FontSize="13"
IsEnabled="{Binding IsSelectButtonEnable}" />
</StackPanel>
<StackPanel />
<Grid
Grid.Row="1"
Grid.Column="1"
Margin="3">
Margin="10">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />

7
MECF.Framework.UI.Client/RecipeEditorLib/DGExtension/DataGridRecipe.xaml.cs
View File

@ -37,9 +37,11 @@ namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension
if (ScrollviewerPositionOffset == null)
ScrollviewerPositionOffset=new double[2];
var _verticalOffset = ScrollviewerPositionOffset[0] <= scroll.ScrollableHeight? scroll.VerticalOffset : ScrollviewerPositionOffset[0];
var _verticalOffset = scroll.VerticalOffset < scroll.ScrollableHeight ? scroll.VerticalOffset :
ScrollviewerPositionOffset[0] <= scroll.ScrollableHeight? scroll.VerticalOffset : ScrollviewerPositionOffset[0];
var _horizontalOffset= ScrollviewerPositionOffset[1] <= scroll.ScrollableWidth ? scroll.HorizontalOffset: ScrollviewerPositionOffset[1];
var _horizontalOffset= scroll.HorizontalOffset < scroll.ScrollableWidth ? scroll.HorizontalOffset :
ScrollviewerPositionOffset[1] <= scroll.ScrollableWidth ? scroll.HorizontalOffset: ScrollviewerPositionOffset[1];
ScrollviewerPositionOffset = new double[] { _verticalOffset, _horizontalOffset };
}
@ -97,6 +99,7 @@ namespace MECF.Framework.UI.Client.RecipeEditorLib.DGExtension
if (self.scroll != null)
{
var _scOffset = (double[])e.NewValue;
self.scroll.ScrollToVerticalOffset(_scOffset[0] <= self.scroll.ScrollableHeight ? _scOffset[0] : self.scroll.ScrollableHeight);
self.scroll.ScrollToHorizontalOffset(_scOffset[1] <= self.scroll.ScrollableWidth ? _scOffset[1] : self.scroll.ScrollableWidth);
}