improve:展台
This commit is contained in:
@@ -10688,9 +10688,9 @@
|
|||||||
<Border x:Name="BoothResolutionTabIndicator"
|
<Border x:Name="BoothResolutionTabIndicator"
|
||||||
Background="#66CCFF"
|
Background="#66CCFF"
|
||||||
CornerRadius="6"
|
CornerRadius="6"
|
||||||
Width="68" Height="38"
|
Width="70" Height="38"
|
||||||
HorizontalAlignment="Left" VerticalAlignment="Center"
|
HorizontalAlignment="Left" VerticalAlignment="Center"
|
||||||
Margin="1,0,0,0"/>
|
Margin="0,0,0,0"/>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Button x:Name="BtnBoothResolution720" Width="70" Height="40" Background="Transparent" BorderThickness="0"
|
<Button x:Name="BtnBoothResolution720" Width="70" Height="40" Background="Transparent" BorderThickness="0"
|
||||||
Click="BoothResolutionTab_Click" Tag="1280,720" Cursor="Hand" HorizontalAlignment="Left">
|
Click="BoothResolutionTab_Click" Tag="1280,720" Cursor="Hand" HorizontalAlignment="Left">
|
||||||
|
|||||||
@@ -3414,7 +3414,7 @@ namespace Ink_Canvas
|
|||||||
|
|
||||||
if (BoothResolutionTabIndicator != null)
|
if (BoothResolutionTabIndicator != null)
|
||||||
{
|
{
|
||||||
BoothResolutionTabIndicator.Margin = new Thickness(1 + index * 70, 0, 0, 0);
|
BoothResolutionTabIndicator.Margin = new Thickness(index * 70, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
var texts = new[] { BtnBoothResolution720?.Content as TextBlock, BtnBoothResolution1080?.Content as TextBlock, BtnBoothResolution2K?.Content as TextBlock, BtnBoothResolution4K?.Content as TextBlock };
|
var texts = new[] { BtnBoothResolution720?.Content as TextBlock, BtnBoothResolution1080?.Content as TextBlock, BtnBoothResolution2K?.Content as TextBlock, BtnBoothResolution4K?.Content as TextBlock };
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace Ink_Canvas
|
|||||||
{
|
{
|
||||||
public partial class MainWindow : Window
|
public partial class MainWindow : Window
|
||||||
{
|
{
|
||||||
private static readonly SolidColorBrush BoothButtonHighlightBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#66CCFF"));
|
private static readonly SolidColorBrush BoothButtonHighlightBrush = new SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#66CCFF"));
|
||||||
private bool _boothButtonPressHandlersAttached;
|
private bool _boothButtonPressHandlersAttached;
|
||||||
|
|
||||||
// 标记:用于在保存/恢复白板内容时排除“展台实时上屏”画面
|
// 标记:用于在保存/恢复白板内容时排除“展台实时上屏”画面
|
||||||
|
|||||||
Reference in New Issue
Block a user