|
@@ -1,6 +1,8 @@
|
|
-using Prism.Commands;
|
|
|
|
|
|
+using Microsoft.Office.Interop.Word;
|
|
|
|
+using Prism.Commands;
|
|
using System;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Collections.Generic;
|
|
|
|
+using System.Diagnostics;
|
|
using System.Linq;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using System.Text;
|
|
using System.Threading.Tasks;
|
|
using System.Threading.Tasks;
|
|
@@ -90,7 +92,7 @@ namespace PDF_Master.CustomControl.CompositeControl
|
|
|
|
|
|
private void UserControl_Loaded(object sender, RoutedEventArgs e)
|
|
private void UserControl_Loaded(object sender, RoutedEventArgs e)
|
|
{
|
|
{
|
|
- ThicknessSlider.ValueChanged += ThicknessSlider_ValueChanged;
|
|
|
|
|
|
+ //ThicknessSlider.ValueChanged += ThicknessSlider_ValueChanged;
|
|
combox.ValueChanged -= combox_ValueChanged;
|
|
combox.ValueChanged -= combox_ValueChanged;
|
|
combox.ValueChanged += combox_ValueChanged;
|
|
combox.ValueChanged += combox_ValueChanged;
|
|
}
|
|
}
|
|
@@ -101,18 +103,20 @@ namespace PDF_Master.CustomControl.CompositeControl
|
|
{
|
|
{
|
|
//点击下拉框时触发
|
|
//点击下拉框时触发
|
|
if (combox.IsExistInComBox(sender))
|
|
if (combox.IsExistInComBox(sender))
|
|
- {
|
|
|
|
|
|
+ {
|
|
|
|
+ Trace.WriteLine("combox_ValueChanged" + (double)sender);
|
|
ThicknessSlider.Value = (double)sender;
|
|
ThicknessSlider.Value = (double)sender;
|
|
|
|
+
|
|
ValueChanged?.Invoke((double)sender, null);
|
|
ValueChanged?.Invoke((double)sender, null);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- private void ThicknessSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
|
|
|
|
- {
|
|
|
|
- combox.SelectedItems = new ComboDataItem(Value);
|
|
|
|
- // ValueChanged?.Invoke(Value, null);
|
|
|
|
- }
|
|
|
|
|
|
+ //事件重复SelectedValuePropertyChanged 2023/4/4
|
|
|
|
+ //private void ThicknessSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
|
|
|
|
+ //{
|
|
|
|
+ // combox.SelectedItems = new ComboDataItem(Value);
|
|
|
|
+ // // ValueChanged?.Invoke(Value, null);
|
|
|
|
+ //}
|
|
|
|
|
|
|
|
|
|
public double Value
|
|
public double Value
|
|
@@ -127,9 +131,10 @@ namespace PDF_Master.CustomControl.CompositeControl
|
|
var control = d as SlidComboControl;
|
|
var control = d as SlidComboControl;
|
|
var value = (double)e.NewValue;
|
|
var value = (double)e.NewValue;
|
|
if (control != null)
|
|
if (control != null)
|
|
- {
|
|
|
|
- control.combox.SelectedItems = new ComboDataItem(value);
|
|
|
|
-
|
|
|
|
|
|
+ {
|
|
|
|
+ Trace.WriteLine("SelectedValuePropertyChanged" + value);
|
|
|
|
+ control.combox.SelectedItems = new ComboDataItem(value,"pt");
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|