improve:窗口模式
This commit is contained in:
@@ -12,7 +12,6 @@
|
|||||||
AllowsTransparency="True"
|
AllowsTransparency="True"
|
||||||
WindowStyle="None"
|
WindowStyle="None"
|
||||||
ResizeMode="NoResize"
|
ResizeMode="NoResize"
|
||||||
WindowState="Maximized"
|
|
||||||
Loaded="Window_Loaded"
|
Loaded="Window_Loaded"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
ShowInTaskbar="False"
|
ShowInTaskbar="False"
|
||||||
@@ -605,6 +604,13 @@
|
|||||||
IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||||
Toggled="ToggleSwitchNoFocusMode_Toggled" />
|
Toggled="ToggleSwitchNoFocusMode_Toggled" />
|
||||||
</ui:SimpleStackPanel>
|
</ui:SimpleStackPanel>
|
||||||
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
|
<TextBlock Foreground="#fafafa" Text="无边框窗口模式" VerticalAlignment="Center"
|
||||||
|
FontSize="14" Margin="0,0,16,0" />
|
||||||
|
<ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchWindowMode"
|
||||||
|
IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
|
||||||
|
Toggled="ToggleSwitchWindowMode_Toggled" />
|
||||||
|
</ui:SimpleStackPanel>
|
||||||
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
<ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
|
||||||
<TextBlock Foreground="#fafafa" Text="窗口置顶" VerticalAlignment="Center"
|
<TextBlock Foreground="#fafafa" Text="窗口置顶" VerticalAlignment="Center"
|
||||||
FontSize="14" Margin="0,0,16,0" />
|
FontSize="14" Margin="0,0,16,0" />
|
||||||
|
|||||||
@@ -514,6 +514,9 @@ namespace Ink_Canvas
|
|||||||
// 加载自定义背景颜色
|
// 加载自定义背景颜色
|
||||||
LoadCustomBackgroundColor();
|
LoadCustomBackgroundColor();
|
||||||
|
|
||||||
|
// 设置窗口模式
|
||||||
|
SetWindowMode();
|
||||||
|
|
||||||
// 注册设置面板滚动事件
|
// 注册设置面板滚动事件
|
||||||
if (SettingsPanelScrollViewer != null)
|
if (SettingsPanelScrollViewer != null)
|
||||||
{
|
{
|
||||||
@@ -769,6 +772,22 @@ namespace Ink_Canvas
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SetWindowMode()
|
||||||
|
{
|
||||||
|
if (Settings.Advanced.WindowMode)
|
||||||
|
{
|
||||||
|
WindowState = WindowState.Normal;
|
||||||
|
Left = 0.0;
|
||||||
|
Top = 0.0;
|
||||||
|
Height = SystemParameters.PrimaryScreenHeight;
|
||||||
|
Width = SystemParameters.PrimaryScreenWidth;
|
||||||
|
}
|
||||||
|
else // 全屏
|
||||||
|
{
|
||||||
|
WindowState = WindowState.Maximized;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void Window_Closing(object sender, CancelEventArgs e)
|
private void Window_Closing(object sender, CancelEventArgs e)
|
||||||
{
|
{
|
||||||
LogHelper.WriteLogToFile("Ink Canvas closing", LogHelper.LogType.Event);
|
LogHelper.WriteLogToFile("Ink Canvas closing", LogHelper.LogType.Event);
|
||||||
|
|||||||
@@ -2532,6 +2532,14 @@ namespace Ink_Canvas
|
|||||||
SaveSettingsToFile();
|
SaveSettingsToFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ToggleSwitchWindowMode_Toggled(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (!isLoaded) return;
|
||||||
|
Settings.Advanced.WindowMode = ToggleSwitchWindowMode.IsOn;
|
||||||
|
SaveSettingsToFile();
|
||||||
|
SetWindowMode();
|
||||||
|
}
|
||||||
|
|
||||||
private void ToggleSwitchIsAutoBackupBeforeUpdate_Toggled(object sender, RoutedEventArgs e)
|
private void ToggleSwitchIsAutoBackupBeforeUpdate_Toggled(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (!isLoaded) return;
|
if (!isLoaded) return;
|
||||||
|
|||||||
@@ -795,6 +795,7 @@ namespace Ink_Canvas
|
|||||||
ToggleSwitchIsLogEnabled.IsOn = Settings.Advanced.IsLogEnabled;
|
ToggleSwitchIsLogEnabled.IsOn = Settings.Advanced.IsLogEnabled;
|
||||||
ToggleSwitchIsSaveLogByDate.IsOn = Settings.Advanced.IsSaveLogByDate;
|
ToggleSwitchIsSaveLogByDate.IsOn = Settings.Advanced.IsSaveLogByDate;
|
||||||
ToggleSwitchIsSecondConfimeWhenShutdownApp.IsOn = Settings.Advanced.IsSecondConfirmWhenShutdownApp;
|
ToggleSwitchIsSecondConfimeWhenShutdownApp.IsOn = Settings.Advanced.IsSecondConfirmWhenShutdownApp;
|
||||||
|
ToggleSwitchWindowMode.IsOn = Settings.Advanced.WindowMode;
|
||||||
ToggleSwitchIsSpecialScreen.IsOn = Settings.Advanced.IsSpecialScreen;
|
ToggleSwitchIsSpecialScreen.IsOn = Settings.Advanced.IsSpecialScreen;
|
||||||
ToggleSwitchIsQuadIR.IsOn = Settings.Advanced.IsQuadIR;
|
ToggleSwitchIsQuadIR.IsOn = Settings.Advanced.IsQuadIR;
|
||||||
ToggleSwitchEraserBindTouchMultiplier.IsOn = Settings.Advanced.EraserBindTouchMultiplier;
|
ToggleSwitchEraserBindTouchMultiplier.IsOn = Settings.Advanced.EraserBindTouchMultiplier;
|
||||||
|
|||||||
@@ -602,6 +602,9 @@ namespace Ink_Canvas
|
|||||||
|
|
||||||
[JsonProperty("enableUIAccessTopMost")]
|
[JsonProperty("enableUIAccessTopMost")]
|
||||||
public bool EnableUIAccessTopMost { get; set; } = false;
|
public bool EnableUIAccessTopMost { get; set; } = false;
|
||||||
|
|
||||||
|
[JsonProperty("windowMode")]
|
||||||
|
public bool WindowMode { get; set; } = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class InkToShape
|
public class InkToShape
|
||||||
|
|||||||
Reference in New Issue
Block a user