From 32fcae1bd45651ec5ae093ecbb5cfd718d67ee16 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Sat, 24 Sep 2022 14:19:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.SCADAControl.csproj        |  16 ++
 .../CustomerControls/TheTextBlock.cs          |  14 +-
 .../CustomerControls/TheTextBox.cs            |  17 +-
 .../Images/Scroll_←.png                     | Bin 0 -> 164 bytes
 .../Images/Scroll_↑.png                     | Bin 0 -> 161 bytes
 .../Images/Scroll_→.png                     | Bin 0 -> 167 bytes
 .../Images/Scroll_↓.png                     | Bin 0 -> 153 bytes
 .../Themes/Generic.xaml                       | 249 ++++++++++++++++++
 BeDesignerSCADA/Controls/MainCanvasPanel.xaml |   2 +-
 BeDesignerSCADA/MainWindow.xaml               |  10 -
 10 files changed, 292 insertions(+), 16 deletions(-)
 create mode 100644 BPASmartClient.SCADAControl/Images/Scroll_←.png
 create mode 100644 BPASmartClient.SCADAControl/Images/Scroll_↑.png
 create mode 100644 BPASmartClient.SCADAControl/Images/Scroll_→.png
 create mode 100644 BPASmartClient.SCADAControl/Images/Scroll_↓.png

diff --git a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
index cb2e73f8..d9582a0a 100644
--- a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
+++ b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
@@ -26,6 +26,10 @@
     <None Remove="Images\redis.png" />
     <None Remove="Images\redisrun.png" />
     <None Remove="Images\redisstop.png" />
+    <None Remove="Images\Scroll_←.png" />
+    <None Remove="Images\Scroll_↑.png" />
+    <None Remove="Images\Scroll_→.png" />
+    <None Remove="Images\Scroll_↓.png" />
     <None Remove="Images\State0.png" />
     <None Remove="Images\State1.png" />
     <None Remove="Images\State11.png" />
@@ -110,6 +114,18 @@
     <Resource Include="Images\redisstop.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\Scroll_←.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\Scroll_↑.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\Scroll_→.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\Scroll_↓.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\State0.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheTextBlock.cs b/BPASmartClient.SCADAControl/CustomerControls/TheTextBlock.cs
index 6466347b..6fb14d28 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheTextBlock.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheTextBlock.cs
@@ -33,8 +33,18 @@ namespace BPASmartClient.SCADAControl.CustomerControls
             ResourceDictionary languageResDic = new ResourceDictionary();
             languageResDic.Source = new Uri(@"/BPASmartClient.SCADAControl;component/Themes/Generic.xaml", UriKind.RelativeOrAbsolute);
             this.Resources.MergedDictionaries.Add(languageResDic);
-            Height = 30;
-            Width = 80;
+            this.Loaded += TheTextBlock_Loaded;
+        }
+
+        private void TheTextBlock_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (this.ActualWidth <= 0)
+            {
+                Text = "文本";
+                Height = 30;
+                Width = 80;
+                FontSize = 16;
+            }
         }
 
         public string ControlType => "控件";
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheTextBox.cs b/BPASmartClient.SCADAControl/CustomerControls/TheTextBox.cs
index b32269a4..52b64ed5 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheTextBox.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheTextBox.cs
@@ -37,12 +37,23 @@ namespace BPASmartClient.SCADAControl.CustomerControls
             ResourceDictionary languageResDic = new ResourceDictionary();
             languageResDic.Source = new Uri(@"/BPASmartClient.SCADAControl;component/Themes/Generic.xaml",UriKind.RelativeOrAbsolute);
             this.Resources.MergedDictionaries.Add(languageResDic);
-            Height = 30;
-            Width = 80;
-            FontSize = 16;
+            
             this.KeyDown += TheTextBox_KeyDown;
             this.TextChanged += TheTextBox_TextChanged;
+            this.Loaded += TheTextBox_Loaded;
         }
+
+        private void TheTextBox_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (this.ActualWidth <= 10)
+            {
+                Text = "文本框";
+                Height = 30;
+                Width = 80;
+                FontSize = 16;
+            }
+        }
+
         bool isRun=false;
         private void TheTextBox_KeyDown(object sender,KeyEventArgs e)
         {
diff --git a/BPASmartClient.SCADAControl/Images/Scroll_←.png b/BPASmartClient.SCADAControl/Images/Scroll_←.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c6e2793106e7d9b4d21d02d3ad11d53fa2f1782
GIT binary patch
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ-0U~39{!9Z>*`6+rArezd&+GCXN)TYVaDDy~
zw$SU&A<3T2PG1CUBlsJbFR}#3bGIK@_`$W-bF-%Qb6>TaI`!)giAtOn2-~sf{vk&5
zk_iirwIpXv&G_K3`|cUTV+IEsuFLHyJS4<uXOY~;5Fb;}{^tI3`=C<-7bo{QR|2hN
N@O1TaS?83{1OUgEJXZh!

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Images/Scroll_↑.png b/BPASmartClient.SCADAControl/Images/Scroll_↑.png
new file mode 100644
index 0000000000000000000000000000000000000000..67a7bf713f447a9c46b1d3b970dea738f39e0ae2
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^+(696!3HEnjZ%I9sSHmS#}J9BrRNm+ngaw}FCKPJ
z2-u;=)a$;ni%ZPy(kUw*&+P}*cJUZoZt*!}I@$cansMk&{!VtWGe2UxCmrF7_c7dU
zz4K_BU6K6GvqjCK&bv&G?E87z)K22_=YtZpu~Yw6JgiiXtDLWUkndEF=<!;hoeZ9?
KelF{r5}E*q3_2kI

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Images/Scroll_→.png b/BPASmartClient.SCADAControl/Images/Scroll_→.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb7e03768959cf8e43053be43f9498305cf8816e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJ-0U~39{!9Z>d7dtgArezl&nfa93J_qqa6R8Z
zLq`3eP?M8_1;ZlqW@ZI}C5tk%Ha-=w5Mgt)E8E;tJM(VlsSy8+kD@^ZM_4!WY&g#Q
znP-Dzzbjir;*m|7!E66re#&NZA#F!;Z+Z)3^qxnbwaY4w?@X8Z&}m-pcTZ%wjiW8d
ONerH@elF{r5}E*D^*S>E

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Images/Scroll_↓.png b/BPASmartClient.SCADAControl/Images/Scroll_↓.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e975baf9b61bf64cf9bedf1d11e1e20bdb4a43b
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^+(696!3HEnjZ%I9sRU0K#}J9Bt)~?Engc{!E*`!u
z!?}#FGa)^dbA^_T*tf<*3Lb{*Px=cVnsM^X-cX(U=2qt=nQV`-7rMw>Tuj;}xco`_
zlfnnBKmF%?wpZZVu=wDt>a%<Qw*<BEn%dor=G4D=R@9*5Zhbh=E(T9mKbLh*2~7a=
CY&ORL

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Themes/Generic.xaml b/BPASmartClient.SCADAControl/Themes/Generic.xaml
index 08ae3759..c2088638 100644
--- a/BPASmartClient.SCADAControl/Themes/Generic.xaml
+++ b/BPASmartClient.SCADAControl/Themes/Generic.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
     xmlns:Themes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"
     xmlns:con="clr-namespace:BPASmartClient.SCADAControl.Converters"
     xmlns:ctrl="clr-namespace:BPASmartClient.SCADAControl.CustomerControls"
@@ -2044,4 +2045,252 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <!--#region ScrollBar-->
+    <Style x:Key="UpScrollBarButton" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Image
+                        Width="8"
+                        Height="5"
+                        Source="../Images/Scroll_↑.png" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="DownScrollBarButton" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Image
+                        Width="8"
+                        Height="5"
+                        Source="../Images/Scroll_↓.png" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="LeftScrollBarButton" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Image
+                        Width="5"
+                        Height="8"
+                        Source="../Images/Scroll_←.png" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="RightScrollBarButton" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Image
+                        Width="5"
+                        Height="8"
+                        Source="../Images/Scroll_→.png" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="VerticalScrollBarPageButton" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Rectangle
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Fill="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border
+                        x:Name="bd1"
+                        Margin="2,2,2,2"
+                        Background="#00c2f4"
+                        CornerRadius="3"
+                        Cursor="Hand"
+                        Opacity="1"
+                        SnapsToDevicePixels="true" />
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter TargetName="bd1" Property="Margin" Value="-1,-1,-1,-1" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <LinearGradientBrush x:Key="HorizontalScrollBarBackground" StartPoint="0,0" EndPoint="0,1">
+        <GradientStop Offset="0" Color="#E1E1E1" />
+        <GradientStop Offset="0.20" Color="#EDEDED" />
+        <GradientStop Offset="0.80" Color="#EDEDED" />
+        <GradientStop Offset="1" Color="#E3E3E3" />
+    </LinearGradientBrush>
+    <Style x:Key="HorizontalScrollBarPageButton" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Rectangle
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Fill="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="{x:Type ScrollBar}">
+        <Setter Property="Background">
+            <Setter.Value>
+                <ImageBrush ImageSource="../Images/biogebj.png" Opacity="0.2" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+        <Setter Property="Opacity" Value="1" />
+        <Setter Property="MinWidth" Value="3" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollBar}">
+                    <Border
+                        Width="10"
+                        Margin="0,0,0,0"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="2"
+                        Opacity="{TemplateBinding Opacity}">
+                        <Grid x:Name="Bg" SnapsToDevicePixels="true">
+                            <Grid.RowDefinitions>
+                                <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
+                                <RowDefinition Height="*" />
+                                <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
+                            </Grid.RowDefinitions>
+                            <RepeatButton
+                                Themes:ScrollChrome.ScrollGlyph="UpArrow"
+                                Command="{x:Static ScrollBar.LineUpCommand}"
+                                IsEnabled="{TemplateBinding IsMouseOver}"
+                                Style="{StaticResource UpScrollBarButton}" />
+                            <Track
+                                x:Name="PART_Track"
+                                Grid.Row="1"
+                                IsDirectionReversed="true"
+                                IsEnabled="{TemplateBinding IsMouseOver}">
+                                <Track.DecreaseRepeatButton>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource VerticalScrollBarPageButton}" />
+                                </Track.DecreaseRepeatButton>
+
+                                <Track.IncreaseRepeatButton>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource VerticalScrollBarPageButton}" />
+                                </Track.IncreaseRepeatButton>
+                                <Track.Thumb>
+                                    <Thumb Themes:ScrollChrome.ScrollGlyph="VerticalGripper" Style="{StaticResource ScrollBarThumb}" />
+                                </Track.Thumb>
+                            </Track>
+                            <RepeatButton
+                                Grid.Row="2"
+                                Themes:ScrollChrome.ScrollGlyph="DownArrow"
+                                Command="{x:Static ScrollBar.LineDownCommand}"
+                                IsEnabled="{TemplateBinding IsMouseOver}"
+                                Style="{StaticResource DownScrollBarButton}" />
+                        </Grid>
+                    </Border>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ScrollBar}">
+                            <Border
+                                Height="10"
+                                Margin="0,0,0,0"
+                                Background="{TemplateBinding Background}"
+                                CornerRadius="2"
+                                Opacity="{TemplateBinding Opacity}">
+                                <Grid
+                                    x:Name="Bg"
+                                    Background="{TemplateBinding Background}"
+                                    SnapsToDevicePixels="true">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
+                                    </Grid.ColumnDefinitions>
+                                    <RepeatButton
+                                        Themes:ScrollChrome.ScrollGlyph="LeftArrow"
+                                        Command="{x:Static ScrollBar.LineLeftCommand}"
+                                        IsEnabled="{TemplateBinding IsMouseOver}"
+                                        Style="{StaticResource LeftScrollBarButton}" />
+                                    <Track
+                                        x:Name="PART_Track"
+                                        Grid.Column="1"
+                                        IsEnabled="{TemplateBinding IsMouseOver}">
+                                        <Track.DecreaseRepeatButton>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource HorizontalScrollBarPageButton}" />
+                                        </Track.DecreaseRepeatButton>
+                                        <Track.IncreaseRepeatButton>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource HorizontalScrollBarPageButton}" />
+                                        </Track.IncreaseRepeatButton>
+                                        <Track.Thumb>
+                                            <Thumb Themes:ScrollChrome.ScrollGlyph="HorizontalGripper" Style="{StaticResource ScrollBarThumb}" />
+                                        </Track.Thumb>
+                                    </Track>
+                                    <RepeatButton
+                                        Grid.Column="2"
+                                        Themes:ScrollChrome.ScrollGlyph="RightArrow"
+                                        Command="{x:Static ScrollBar.LineRightCommand}"
+                                        IsEnabled="{TemplateBinding IsMouseOver}"
+                                        Style="{StaticResource RightScrollBarButton}" />
+                                </Grid>
+                            </Border>
+
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <LinearGradientBrush x:Key="VerticalScrollBarBackground" StartPoint="0,0" EndPoint="1,0">
+        <GradientStop Offset="0" Color="#E1E1E1" />
+        <GradientStop Offset="0.20" Color="#EDEDED" />
+        <GradientStop Offset="0.80" Color="#EDEDED" />
+        <GradientStop Offset="1" Color="#E3E3E3" />
+    </LinearGradientBrush>
+    <!--#endregion-->
 </ResourceDictionary>
diff --git a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
index 952ee3d4..78bc1612 100644
--- a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
+++ b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
@@ -30,7 +30,7 @@
 
         <!--左侧选择区域-->
         <Grid >
-            <Border BorderThickness="1" BorderBrush="{StaticResource AccentBrush}" Background="White"  Margin="4">
+            <Border BorderThickness="1" BorderBrush="{StaticResource AccentBrush}" Background="Transparent"  Margin="4">
                 <ListBox x:Name="CtlList" Background="Transparent" ItemTemplate="{DynamicResource ToolBoxStyle}" BorderThickness="0" PreviewMouseMove="CtlList_PreviewMouseMove">
                 </ListBox>
             </Border>
diff --git a/BeDesignerSCADA/MainWindow.xaml b/BeDesignerSCADA/MainWindow.xaml
index 7301a858..2db56d8c 100644
--- a/BeDesignerSCADA/MainWindow.xaml
+++ b/BeDesignerSCADA/MainWindow.xaml
@@ -12,16 +12,6 @@
         mc:Ignorable="d" 
         WindowStartupLocation="CenterScreen"
         Title="黑菠萝科技-[组态软件1.0]" Height="900" Width="1400" Icon="/Images/ico.ico" >
-
-    <Window.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/BeDesignerSCADA;component/Themes/Styles.xaml" />
-                <ResourceDictionary Source="/BPASmartClient.SCADAControl;component/Themes/Generic.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Window.Resources>
-
     <Border x:Name="grid">
     </Border>
 </Window>