移除主窗口置顶功能
This commit is contained in:
@@ -70,10 +70,6 @@
|
|||||||
Content="生成PP钻带"
|
Content="生成PP钻带"
|
||||||
IsEnabled="{Binding CanGeneratePpDrillTape}"
|
IsEnabled="{Binding CanGeneratePpDrillTape}"
|
||||||
Visibility="{Binding CanGeneratePpDrillTape, Converter={StaticResource BooleanToVisibilityConverter}}" />
|
Visibility="{Binding CanGeneratePpDrillTape, Converter={StaticResource BooleanToVisibilityConverter}}" />
|
||||||
<Button
|
|
||||||
Name="ToggleTopmostButton"
|
|
||||||
Click="ToggleTopmostButton_Click"
|
|
||||||
Content="{Binding TopmostButtonText}" />
|
|
||||||
</ToolBar>
|
</ToolBar>
|
||||||
|
|
||||||
<!-- 主内容区域 -->
|
<!-- 主内容区域 -->
|
||||||
|
|||||||
@@ -35,10 +35,6 @@ namespace DrillTools
|
|||||||
InitializeDragDrop();
|
InitializeDragDrop();
|
||||||
//System.Diagnostics.Debug.WriteLine("拖放功能初始化完成");
|
//System.Diagnostics.Debug.WriteLine("拖放功能初始化完成");
|
||||||
|
|
||||||
// 设置默认置顶状态
|
|
||||||
this.Topmost = viewModel.IsTopmost;
|
|
||||||
//System.Diagnostics.Debug.WriteLine("置顶状态设置完成");
|
|
||||||
|
|
||||||
// 如果有初始文件路径,在窗口加载完成后自动加载
|
// 如果有初始文件路径,在窗口加载完成后自动加载
|
||||||
if (!string.IsNullOrEmpty(initialFilePath))
|
if (!string.IsNullOrEmpty(initialFilePath))
|
||||||
{
|
{
|
||||||
@@ -297,15 +293,6 @@ namespace DrillTools
|
|||||||
ViewModel.MoveSelectedToolDown();
|
ViewModel.MoveSelectedToolDown();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 置顶按钮点击事件
|
|
||||||
/// </summary>
|
|
||||||
private void ToggleTopmostButton_Click(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
ViewModel.ToggleTopmost();
|
|
||||||
this.Topmost = ViewModel.IsTopmost;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 刀具列表双击事件
|
/// 刀具列表双击事件
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ namespace DrillTools
|
|||||||
private bool _canMoveUp;
|
private bool _canMoveUp;
|
||||||
private bool _canMoveDown;
|
private bool _canMoveDown;
|
||||||
private string _originalFilePath = string.Empty;
|
private string _originalFilePath = string.Empty;
|
||||||
private bool _isTopmost = false; // 默认不顶置
|
|
||||||
private string _fileNameWithoutExtension = string.Empty;
|
private string _fileNameWithoutExtension = string.Empty;
|
||||||
private double _minDrillDiameter;
|
private double _minDrillDiameter;
|
||||||
private double _minSlotDiameter;
|
private double _minSlotDiameter;
|
||||||
@@ -174,27 +173,6 @@ namespace DrillTools
|
|||||||
set => SetProperty(ref _shouldCheckSortFileOnLoad, value);
|
set => SetProperty(ref _shouldCheckSortFileOnLoad, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 窗口是否置顶
|
|
||||||
/// </summary>
|
|
||||||
public bool IsTopmost
|
|
||||||
{
|
|
||||||
get => _isTopmost;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (SetProperty(ref _isTopmost, value))
|
|
||||||
{
|
|
||||||
// 当IsTopmost改变时,通知TopmostButtonText属性也已更改
|
|
||||||
OnPropertyChanged(nameof(TopmostButtonText));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 置顶按钮显示文本
|
|
||||||
/// </summary>
|
|
||||||
public string TopmostButtonText => IsTopmost ? "取消置顶" : "窗口置顶";
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 文件名(不包含后缀)
|
/// 文件名(不包含后缀)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -1683,14 +1661,6 @@ M30";
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 切换窗口置顶状态
|
|
||||||
/// </summary>
|
|
||||||
public void ToggleTopmost()
|
|
||||||
{
|
|
||||||
IsTopmost = !IsTopmost;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 更新最小直径信息
|
/// 更新最小直径信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user