zhusenlin/aistudio-wpf-diagram
1
0
Fork 0
mirror of https://gitee.com/akwkevin/aistudio.-wpf.-diagram synced 2026-04-23 09:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

最近精简代码，有些bug，修复

Browse Source
This commit is contained in:
艾竹
2023-04-08 14:22:12 +08:00
parent 347488e8e9
commit 78da8f4852
15 changed files with 193 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml
View File

@@ -2383,9 +2383,10 @@
<DataTemplate>
<Grid>
<ScrollViewer x:Name="designerScrollViewer"
Background="{DynamicResource GrayBrush8}"
HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto">
Background="{DynamicResource GrayBrush8}"
HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto"
Focusable="False">
<DockPanel x:Name="panel">
<controls:Ruler x:Name="hruler"
Unit="{Binding PageUnit,Converter={StaticResource RulerUnitConverter}}"

24
AIStudio.Wpf.DiagramApp/Views/MainWindow.xaml.cs
View File

@@ -46,7 +46,7 @@ namespace AIStudio.Wpf.DiagramApp
private void HookEvents()
{
this.PreviewMouseWheel += this.OnPreviewMouseWheel;
//this.PreviewMouseWheel += this.OnPreviewMouseWheel;
}
private void ZoomSlider_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
@@ -55,20 +55,20 @@ namespace AIStudio.Wpf.DiagramApp
TextOptions.SetTextFormattingMode(this, textFormattingMode);
}
private void OnPreviewMouseWheel(object sender, MouseWheelEventArgs e)
{
if (Keyboard.IsKeyDown(Key.LeftCtrl) == false
&& Keyboard.IsKeyDown(Key.RightCtrl) == false)
{
return;
}
//private void OnPreviewMouseWheel(object sender, MouseWheelEventArgs e)
//{
// if (Keyboard.IsKeyDown(Key.LeftCtrl) == false
// && Keyboard.IsKeyDown(Key.RightCtrl) == false)
// {
// return;
// }
var newZoomValue = this.zoomSlider.Value + (e.Delta > 0 ? 0.1 : -0.1);
// var newZoomValue = this.zoomSlider.Value + (e.Delta > 0 ? 0.1 : -0.1);
this.zoomSlider.Value = Math.Max(Math.Min(newZoomValue, this.zoomSlider.Maximum), this.zoomSlider.Minimum);
// this.zoomSlider.Value = Math.Max(Math.Min(newZoomValue, this.zoomSlider.Maximum), this.zoomSlider.Minimum);
e.Handled = true;
}
// e.Handled = true;
//}
private void btnPrint_Click(object sender, RoutedEventArgs e)
{