fix:窗口标题栏最小化隐藏 oobe 上下一步无法触摸
This commit is contained in:
@@ -10,6 +10,7 @@
|
|||||||
Title="云存储管理" Height="600" Width="900"
|
Title="云存储管理" Height="600" Width="900"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
ResizeMode="CanResize"
|
ResizeMode="CanResize"
|
||||||
|
Topmost="True"
|
||||||
ui:ThemeManager.IsThemeAware="True"
|
ui:ThemeManager.IsThemeAware="True"
|
||||||
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
||||||
ui:WindowHelper.SystemBackdropType="Mica"
|
ui:WindowHelper.SystemBackdropType="Mica"
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="历史版本回滚" Height="650" Width="900" ResizeMode="CanResize"
|
Title="历史版本回滚" Height="650" Width="900" ResizeMode="CanResize"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
|
Topmost="True"
|
||||||
Background="{DynamicResource SettingsPageBackground}" MinHeight="550" MinWidth="800"
|
Background="{DynamicResource SettingsPageBackground}" MinHeight="550" MinWidth="800"
|
||||||
SnapsToDevicePixels="True"
|
SnapsToDevicePixels="True"
|
||||||
TextOptions.TextRenderingMode="ClearType"
|
TextOptions.TextRenderingMode="ClearType"
|
||||||
|
|||||||
@@ -13,13 +13,9 @@
|
|||||||
MinWidth="400"
|
MinWidth="400"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
ResizeMode="CanResize"
|
ResizeMode="CanResize"
|
||||||
ShowInTaskbar="False"
|
Topmost="True"
|
||||||
Background="{DynamicResource SettingsPageBackground}"
|
Background="{DynamicResource SettingsPageBackground}"
|
||||||
Loaded="OobeWindow_OnLoaded"
|
Loaded="OobeWindow_OnLoaded"
|
||||||
IsManipulationEnabled="True"
|
|
||||||
TouchDown="Window_TouchDown"
|
|
||||||
TouchMove="Window_TouchMove"
|
|
||||||
TouchUp="Window_TouchUp"
|
|
||||||
ui:ThemeManager.IsThemeAware="True"
|
ui:ThemeManager.IsThemeAware="True"
|
||||||
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
||||||
ui:WindowHelper.SystemBackdropType="Mica"
|
ui:WindowHelper.SystemBackdropType="Mica"
|
||||||
@@ -28,33 +24,64 @@
|
|||||||
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<Style x:Key="OobeSecondaryButtonStyle" TargetType="Button">
|
<Style x:Key="OobeSecondaryButtonStyle" TargetType="Button">
|
||||||
<Setter Property="Background" Value="{DynamicResource SettingsPageBackground}" />
|
<Setter Property="Background" Value="#f8f8f8" />
|
||||||
<Setter Property="Foreground" Value="{DynamicResource SettingsPageForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource SettingsPageForeground}" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource SettingsPageBorderBrush}" />
|
<Setter Property="BorderBrush" Value="{DynamicResource SettingsPageBorderBrush}" />
|
||||||
<Setter Property="BorderThickness" Value="1" />
|
<Setter Property="BorderThickness" Value="1" />
|
||||||
<Setter Property="Padding" Value="6,0" />
|
<Setter Property="Padding" Value="6,0" />
|
||||||
<Setter Property="IsManipulationEnabled" Value="True" />
|
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="Button">
|
<ControlTemplate TargetType="Button">
|
||||||
<Border Background="{TemplateBinding Background}"
|
<Border x:Name="Border"
|
||||||
|
Background="{TemplateBinding Background}"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
CornerRadius="4">
|
CornerRadius="4">
|
||||||
<ContentPresenter HorizontalAlignment="Center"
|
<ContentPresenter HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center" />
|
VerticalAlignment="Center" />
|
||||||
</Border>
|
</Border>
|
||||||
|
<ControlTemplate.Triggers>
|
||||||
|
<Trigger Property="IsPressed" Value="True">
|
||||||
|
<Setter TargetName="Border" Property="Background" Value="#d8d8d8" />
|
||||||
|
</Trigger>
|
||||||
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
|
<Setter TargetName="Border" Property="Background" Value="#e8e8e8" />
|
||||||
|
</Trigger>
|
||||||
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="OobePrimaryButtonStyle"
|
<Style x:Key="OobePrimaryButtonStyle"
|
||||||
TargetType="Button"
|
TargetType="Button">
|
||||||
BasedOn="{StaticResource OobeSecondaryButtonStyle}">
|
<Setter Property="Background" Value="#3b82f6" />
|
||||||
<Setter Property="Background" Value="{DynamicResource HistoryWindowPrimaryBrush}" />
|
<Setter Property="BorderBrush" Value="#3b82f6" />
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource HistoryWindowPrimaryBrush}" />
|
|
||||||
<Setter Property="Foreground" Value="White" />
|
<Setter Property="Foreground" Value="White" />
|
||||||
|
<Setter Property="BorderThickness" Value="1" />
|
||||||
|
<Setter Property="Padding" Value="6,0" />
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="Button">
|
||||||
|
<Border x:Name="Border"
|
||||||
|
Background="{TemplateBinding Background}"
|
||||||
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
|
CornerRadius="4">
|
||||||
|
<ContentPresenter HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center" />
|
||||||
|
</Border>
|
||||||
|
<ControlTemplate.Triggers>
|
||||||
|
<Trigger Property="IsPressed" Value="True">
|
||||||
|
<Setter TargetName="Border" Property="Background" Value="#1d4ed8" />
|
||||||
|
</Trigger>
|
||||||
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
|
<Setter TargetName="Border" Property="Background" Value="#2563eb" />
|
||||||
|
</Trigger>
|
||||||
|
</ControlTemplate.Triggers>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
|
|
||||||
|
|||||||
@@ -474,38 +474,7 @@ namespace Ink_Canvas.Windows
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 处理触摸事件,确保窗口能够响应触摸屏操作。
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="sender">事件发送者。</param>
|
|
||||||
/// <param name="e">触摸事件参数。</param>
|
|
||||||
private void Window_TouchDown(object sender, System.Windows.Input.TouchEventArgs e)
|
|
||||||
{
|
|
||||||
// 触摸事件处理逻辑
|
|
||||||
e.Handled = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 处理触摸移动事件。
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="sender">事件发送者。</param>
|
|
||||||
/// <param name="e">触摸事件参数。</param>
|
|
||||||
private void Window_TouchMove(object sender, System.Windows.Input.TouchEventArgs e)
|
|
||||||
{
|
|
||||||
// 触摸移动事件处理逻辑
|
|
||||||
e.Handled = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 处理触摸抬起事件。
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="sender">事件发送者。</param>
|
|
||||||
/// <param name="e">触摸事件参数。</param>
|
|
||||||
private void Window_TouchUp(object sender, System.Windows.Input.TouchEventArgs e)
|
|
||||||
{
|
|
||||||
// 触摸抬起事件处理逻辑
|
|
||||||
e.Handled = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 根据当前步骤索引更新向导界面:显示对应步骤面板,播放切换动画,并刷新步骤指示、标题、子标题和按钮文本/可见性。
|
/// 根据当前步骤索引更新向导界面:显示对应步骤面板,播放切换动画,并刷新步骤指示、标题、子标题和按钮文本/可见性。
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
Title="插件管理" Height="550" Width="800"
|
Title="插件管理" Height="550" Width="800"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
ResizeMode="CanResize"
|
ResizeMode="CanResize"
|
||||||
|
Topmost="True"
|
||||||
ui:ThemeManager.IsThemeAware="True"
|
ui:ThemeManager.IsThemeAware="True"
|
||||||
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
||||||
ui:WindowHelper.SystemBackdropType="Mica"
|
ui:WindowHelper.SystemBackdropType="Mica"
|
||||||
|
|||||||
Reference in New Issue
Block a user