Skip to content

T
Thick-Common
Commit 6113b027 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

修改 FLY.ControlLibrary Style

parent a31fee73
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 79 deletions
Project.FLY.ControlLibrary/FLY.ControlLibrary/FLY.ControlLibrary.csproj
View file @ 6113b027
...@@ -184,6 +184,18 @@ ...@@ -184,6 +184,18 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Resource> </Resource>
<Page Include="Themes\BaseStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\SectionStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\UiModuleStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UI.OSK\Window_FullPad.xaml"> <Page Include="UI.OSK\Window_FullPad.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/BaseStyle.xaml 0 → 100644
View file @ 6113b027
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Colors.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!-- 标准间隔 -->
<Thickness x:Key="ControlMargin">5</Thickness>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/ButtonStyle.xaml
View file @ 6113b027
...@@ -161,36 +161,8 @@ ...@@ -161,36 +161,8 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<!--标题区,左边的后退键(蓝底白图标)-->
<Style TargetType="Button" x:Key="ButtonStyle_back" BasedOn="{StaticResource ButtonStyle_empty}">
<Setter Property="Height" Value="80"/>
<Setter Property="Width" Value="80"/>
<Setter Property="Margin" Value="0,24"/>
<Setter Property="Background" Value="{StaticResource Brush_theme_bar}"/>
<Setter Property="Content">
<Setter.Value>
<Path Fill="White" Data="{StaticResource Geometry_arrow-left-bold}"
SnapsToDevicePixels ="True"
Stretch="Fill"
Height="60" Width="60" HorizontalAlignment="Right" Margin="0,0,-2,0"/>
</Setter.Value>
</Setter>
</Style>
<!--标题区,左边的后退键(白底蓝图标)-->
<Style TargetType="Button" x:Key="ButtonStyle_back2" BasedOn="{StaticResource ButtonStyle_empty}">
<Setter Property="Height" Value="80"/>
<Setter Property="Width" Value="80"/>
<Setter Property="Margin" Value="0,24,0,24"/>
<Setter Property="Background" Value="White"/>
<Setter Property="Content">
<Setter.Value>
<Path Fill="{StaticResource Brush_theme_bar}" Data="{StaticResource Geometry_arrow-left-bold}"
SnapsToDevicePixels ="True"
Stretch="Fill"
Height="60" Width="60" HorizontalAlignment="Right" Margin="0,0,-2,0"/>
</Setter.Value>
</Setter>
</Style>
<!--button内的阴影--> <!--button内的阴影-->
<Style TargetType="Grid" x:Key="GridStyle_ButtonShadow"> <Style TargetType="Grid" x:Key="GridStyle_ButtonShadow">
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/Dictionary_MyStyle.xaml
View file @ 6113b027
...@@ -6,23 +6,11 @@ ...@@ -6,23 +6,11 @@
> >
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/MaterialDesignIcons.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/MaterialDesignIcons.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Colors.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/BaseStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/TextStyle.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/TextStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/ButtonStyle.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/ButtonStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/SectionStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/NoToggleButtonStyle.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/NoToggleButtonStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/UiModuleStyle.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<!--动态区 UiModule 的背景框-->
<Style TargetType="Border" x:Key="BorderStyle_module">
<Setter Property="Background" Value="{StaticResource Color_theme_background}"/>
<Setter Property="Margin" Value="3"/>
<Setter Property="CornerRadius" Value="3"/>
<Setter Property="Effect">
<Setter.Value>
<DropShadowEffect Color="Black" Direction="270" ShadowDepth="1" Opacity="0.23" />
</Setter.Value>
</Setter>
</Style>
<Thickness x:Key="ControlMargin">5</Thickness>
</ResourceDictionary> </ResourceDictionary>
\ No newline at end of file
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/SectionStyle.xaml 0 → 100644
View file @ 6113b027
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/BaseStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/ButtonStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!-- 参数设置页 每个section 的标题框 -->
<Style TargetType="Border" x:Key="BorderStyle_paramSection">
<Setter Property="Width" Value="150"/>
<Setter Property="Background" Value="{StaticResource Color_theme_activity}"/>
<Setter Property="Margin" Value="0,5,5,5"/>
<Style.Resources>
<Style TargetType="TextBlock" BasedOn="{StaticResource TextStyle_paramSection}"/>
</Style.Resources>
</Style>
<!-- 参数设置页 可点击的 section 的标题框 -->
<Style TargetType="{x:Type Button}" x:Key="ButtonStyle_paramSection" BasedOn="{StaticResource ButtonStyle3}">
<Setter Property="Width" Value="150"/>
<Setter Property="Margin" Value="0,5,5,5"/>
<Style.Resources>
<Style TargetType="TextBlock" BasedOn="{StaticResource TextStyle_paramSection}"/>
</Style.Resources>
</Style>
<!-- 参数设置页 每个section 的标题框 内的标题-->
<Style TargetType="TextBlock" x:Key="TextStyle_paramSection">
<Setter Property="Margin" Value="5"/>
<Setter Property="Foreground" Value="#FFFFFFFF" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="30" />
<Setter Property="FontFamily" Value="YouYuan" />
<Setter Property="TextAlignment" Value="Right" />
</Style>
<!-- **废弃** 参数设置页 每个section 的标题框 内的标题 -->
<Style TargetType="TextBlock" x:Key="TextBlockStyle_ItemHeader">
<Setter Property="Margin" Value="5"/>
<Setter Property="Foreground" Value="#FFFFFFFF" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="30" />
<Setter Property="FontFamily" Value="YouYuan" />
<Setter Property="TextAlignment" Value="Right" />
</Style>
<!-- 参数页标题 -->
<Style TargetType="TextBlock" x:Key="TextBlockStyle_Title">
<Setter Property="Margin" Value="160,0,0,0" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="60" />
<Setter Property="FontFamily" Value="YouYuan" />
<Setter Property="TextAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
<!--标题区,左边的后退键(蓝底白图标)-->
<Style TargetType="Button" x:Key="ButtonStyle_back" BasedOn="{StaticResource ButtonStyle_empty}">
<Setter Property="Height" Value="80"/>
<Setter Property="Width" Value="80"/>
<Setter Property="Margin" Value="0,24"/>
<Setter Property="Background" Value="{StaticResource Brush_theme_bar}"/>
<Setter Property="Content">
<Setter.Value>
<Path Fill="White" Data="{StaticResource Geometry_arrow-left-bold}"
SnapsToDevicePixels ="True"
Stretch="Fill"
Height="60" Width="60" HorizontalAlignment="Right" Margin="0,0,-2,0"/>
</Setter.Value>
</Setter>
</Style>
<!--标题区,左边的后退键(白底蓝图标)-->
<Style TargetType="Button" x:Key="ButtonStyle_back2" BasedOn="{StaticResource ButtonStyle_empty}">
<Setter Property="Height" Value="80"/>
<Setter Property="Width" Value="80"/>
<Setter Property="Margin" Value="0,24,0,24"/>
<Setter Property="Background" Value="White"/>
<Setter Property="Content">
<Setter.Value>
<Path Fill="{StaticResource Brush_theme_bar}" Data="{StaticResource Geometry_arrow-left-bold}"
SnapsToDevicePixels ="True"
Stretch="Fill"
Height="60" Width="60" HorizontalAlignment="Right" Margin="0,0,-2,0"/>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/TextStyle.xaml
View file @ 6113b027
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
mc:Ignorable="d" mc:Ignorable="d"
> >
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Colors.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/BaseStyle.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<!-- 输入框 带虚拟键盘 -->
<Style TargetType="TextBox" x:Key="TextBoxStyle1"> <Style TargetType="TextBox" x:Key="TextBoxStyle1">
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
</Setter> </Setter>
</Style> </Style>
<!-- 可写项 的标题 -->
<Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldHeaderEditable"> <Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldHeaderEditable">
<Setter Property="Margin" Value="3" /> <Setter Property="Margin" Value="3" />
<Setter Property="Foreground" Value="#FF0083D7" /> <Setter Property="Foreground" Value="#FF0083D7" />
...@@ -43,6 +44,8 @@ ...@@ -43,6 +44,8 @@
<Setter Property="FontFamily" Value="YouYuan" /> <Setter Property="FontFamily" Value="YouYuan" />
<Setter Property="TextAlignment" Value="Left" /> <Setter Property="TextAlignment" Value="Left" />
</Style> </Style>
<!-- 只读项 的标题 -->
<Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldHeader"> <Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldHeader">
<Setter Property="Margin" Value="3" /> <Setter Property="Margin" Value="3" />
<Setter Property="Foreground" Value="#FF3B3B3B" /> <Setter Property="Foreground" Value="#FF3B3B3B" />
...@@ -52,14 +55,7 @@ ...@@ -52,14 +55,7 @@
<Setter Property="TextAlignment" Value="Left" /> <Setter Property="TextAlignment" Value="Left" />
</Style> </Style>
<Style TargetType="TextBlock" x:Key="TextBlockStyle_ItemHeader"> <!-- 只读项 内容 -->
<Setter Property="Margin" Value="0,9,0,0" />
<Setter Property="Foreground" Value="#FFFFFFFF" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="30" />
<Setter Property="FontFamily" Value="YouYuan" />
<Setter Property="TextAlignment" Value="Right" />
</Style>
<Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldContent"> <Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldContent">
<Setter Property="Margin" Value="3" /> <Setter Property="Margin" Value="3" />
<Setter Property="Foreground" Value="#FF3B3B3B" /> <Setter Property="Foreground" Value="#FF3B3B3B" />
...@@ -68,6 +64,8 @@ ...@@ -68,6 +64,8 @@
<Setter Property="FontFamily" Value="Microsoft Sans Serif" /> <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
<Setter Property="TextAlignment" Value="Left" /> <Setter Property="TextAlignment" Value="Left" />
</Style> </Style>
<!-- 输入框 内容 -->
<Style TargetType="TextBox" x:Key="TextBoxStyle_FieldContent" BasedOn="{StaticResource ResourceKey=TextBoxStyle1}"> <Style TargetType="TextBox" x:Key="TextBoxStyle_FieldContent" BasedOn="{StaticResource ResourceKey=TextBoxStyle1}">
<Setter Property="Margin" Value="3" /> <Setter Property="Margin" Value="3" />
<Setter Property="Foreground" Value="#FF3B3B3B" /> <Setter Property="Foreground" Value="#FF3B3B3B" />
...@@ -76,8 +74,9 @@ ...@@ -76,8 +74,9 @@
<Setter Property="FontFamily" Value="Microsoft Sans Serif" /> <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
<Setter Property="TextAlignment" Value="Left" /> <Setter Property="TextAlignment" Value="Left" />
<Setter Property="MinWidth" Value="30" /> <Setter Property="MinWidth" Value="30" />
</Style> </Style>
<!-- 内容的分割线 -->
<Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldContent_mm_interval"> <Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldContent_mm_interval">
<Setter Property="Foreground" Value="#FF888888" /> <Setter Property="Foreground" Value="#FF888888" />
<Setter Property="FontSize" Value="36" /> <Setter Property="FontSize" Value="36" />
...@@ -85,6 +84,8 @@ ...@@ -85,6 +84,8 @@
<Setter Property="TextAlignment" Value="Left" /> <Setter Property="TextAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Bottom" /> <Setter Property="VerticalAlignment" Value="Bottom" />
</Style> </Style>
<!-- 内容的单位 -->
<Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldContent_mm"> <Style TargetType="TextBlock" x:Key="TextBlockStyle_FieldContent_mm">
<Setter Property="Foreground" Value="#FF888888" /> <Setter Property="Foreground" Value="#FF888888" />
<Setter Property="FontSize" Value="22" /> <Setter Property="FontSize" Value="22" />
...@@ -92,14 +93,7 @@ ...@@ -92,14 +93,7 @@
<Setter Property="TextAlignment" Value="Left" /> <Setter Property="TextAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Bottom" /> <Setter Property="VerticalAlignment" Value="Bottom" />
</Style> </Style>
<Style TargetType="TextBlock" x:Key="TextBlockStyle_Title">
<Setter Property="Margin" Value="160,0,0,0" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="60" />
<Setter Property="FontFamily" Value="YouYuan" />
<Setter Property="TextAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
</ResourceDictionary> </ResourceDictionary>
\ No newline at end of file
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/UiModuleStyle.xaml 0 → 100644
View file @ 6113b027
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/BaseStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!--动态区 UiModule 的背景框-->
<Style TargetType="Border" x:Key="BorderStyle_module">
<Setter Property="Background" Value="{StaticResource Color_theme_background}"/>
<Setter Property="Margin" Value="3"/>
<Setter Property="CornerRadius" Value="3"/>
<Setter Property="Effect">
<Setter.Value>
<DropShadowEffect Color="Black" Direction="270" ShadowDepth="1" Opacity="0.23" />
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.ControlLibrary/WPFTitleTextBox.sln
View file @ 6113b027
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2010 # Visual Studio Version 16
VisualStudioVersion = 16.0.29609.76
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.ControlLibrary", "FLY.ControlLibrary\FLY.ControlLibrary.csproj", "{119C3ADC-F8E1-4F72-B89B-006236FF8586}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.ControlLibrary", "FLY.ControlLibrary\FLY.ControlLibrary.csproj", "{119C3ADC-F8E1-4F72-B89B-006236FF8586}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApplication1", "WpfApplication1\WpfApplication1.csproj", "{4B63FCAB-926E-434B-A5A0-C2BD371D796A}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -25,18 +25,11 @@ Global ...@@ -25,18 +25,11 @@ Global
{119C3ADC-F8E1-4F72-B89B-006236FF8586}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {119C3ADC-F8E1-4F72-B89B-006236FF8586}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{119C3ADC-F8E1-4F72-B89B-006236FF8586}.Release|Mixed Platforms.Build.0 = Release|Any CPU {119C3ADC-F8E1-4F72-B89B-006236FF8586}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{119C3ADC-F8E1-4F72-B89B-006236FF8586}.Release|x86.ActiveCfg = Release|Any CPU {119C3ADC-F8E1-4F72-B89B-006236FF8586}.Release|x86.ActiveCfg = Release|Any CPU
{4B63FCAB-926E-434B-A5A0-C2BD371D796A}.Debug|Any CPU.ActiveCfg = Debug|x86
{4B63FCAB-926E-434B-A5A0-C2BD371D796A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{4B63FCAB-926E-434B-A5A0-C2BD371D796A}.Debug|Mixed Platforms.Build.0 = Debug|x86
{4B63FCAB-926E-434B-A5A0-C2BD371D796A}.Debug|x86.ActiveCfg = Debug|x86
{4B63FCAB-926E-434B-A5A0-C2BD371D796A}.Debug|x86.Build.0 = Debug|x86
{4B63FCAB-926E-434B-A5A0-C2BD371D796A}.Release|Any CPU.ActiveCfg = Release|x86
{4B63FCAB-926E-434B-A5A0-C2BD371D796A}.Release|Mixed Platforms.ActiveCfg = Release|x86
{4B63FCAB-926E-434B-A5A0-C2BD371D796A}.Release|Mixed Platforms.Build.0 = Release|x86
{4B63FCAB-926E-434B-A5A0-C2BD371D796A}.Release|x86.ActiveCfg = Release|x86
{4B63FCAB-926E-434B-A5A0-C2BD371D796A}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {318AC2E4-38B7-4874-B3FC-9EE62835DC51}
EndGlobalSection
EndGlobal EndGlobal
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment