Skip to content

dev pull request master #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yanjinhuagood merged 48 commits into from
Sep 1, 2023
Merged

dev pull request master #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
d64fdad
Merge pull request #63 from WPFDevelopersOrg/master
yanjinhuagood Aug 16, 2023
5f37356
Update TextBoxHelper.cs
yanjinhuagood Aug 23, 2023
7861a55
Create IPEditBox.cs
yanjinhuagood Aug 23, 2023
f0dccd0
Create IPEditBox.xaml
yanjinhuagood Aug 23, 2023
a7aa78e
Update ColorPicker.xaml
yanjinhuagood Aug 23, 2023
3bbcbc0
Update Theme.xaml
yanjinhuagood Aug 23, 2023
8092b76
Update Theme40.txt
yanjinhuagood Aug 23, 2023
da8b016
Update Theme45x.txt
yanjinhuagood Aug 23, 2023
c2b0b37
Update WPFDevelopers.Shared.projitems
yanjinhuagood Aug 23, 2023
3a4a3d2
Merge branch 'dev' of https://github.com/WPFDevelopersOrg/WPFDevelope…
yanjinhuagood Aug 23, 2023
1e7addc
Update ColorPicker.xaml
yanjinhuagood Aug 24, 2023
ee6b1ae
Update IPEditBox.xaml
yanjinhuagood Aug 24, 2023
1e54e75
Update IPEditBox.cs
yanjinhuagood Aug 24, 2023
5d21ce2
Update WPFDevelopers.SamplesCode.csproj
yanjinhuagood Aug 24, 2023
31bef64
Update WPFDevelopers.Samples40.csproj
yanjinhuagood Aug 24, 2023
0981d02
Update WPFDevelopers.Samples.Shared.projitems
yanjinhuagood Aug 24, 2023
1c8d6c5
Update MainVM.cs
yanjinhuagood Aug 24, 2023
d569d3f
Update MenuEnum.cs
yanjinhuagood Aug 24, 2023
4a8b74c
Create IPEditBoxExample.xaml.cs
yanjinhuagood Aug 24, 2023
9c92373
Create IPEditBoxExample.xaml
yanjinhuagood Aug 24, 2023
c41544e
Update Theme.xaml
yanjinhuagood Aug 24, 2023
7b53089
Update TextBoxHelper.cs
yanjinhuagood Aug 24, 2023
df75f96
Update IPEditBox.cs
yanjinhuagood Aug 24, 2023
4df7316
Update IPEditBox.cs
yanjinhuagood Aug 28, 2023
3d7150f
Update ElementAdorner.cs
yanjinhuagood Aug 28, 2023
2e1b715
Create TransformThumb.xaml
yanjinhuagood Aug 28, 2023
137341d
Create TransformThumb.cs
yanjinhuagood Aug 28, 2023
920d78f
Update App.xaml
yanjinhuagood Aug 28, 2023
3899411
Delete ThumbDragAndAngleExample.xaml.cs
yanjinhuagood Aug 28, 2023
d99a8a2
Delete ThumbDragAndAngleExample.xaml
yanjinhuagood Aug 28, 2023
0de4eb7
Create TransformThumbExample.xaml
yanjinhuagood Aug 28, 2023
3e55d55
Create TransformThumbExample.xaml.cs
yanjinhuagood Aug 28, 2023
86c4da9
Update MenuEnum.cs
yanjinhuagood Aug 28, 2023
b5b3f1e
Update MainVM.cs
yanjinhuagood Aug 28, 2023
d8b8db2
Update WPFDevelopers.Samples.Shared.projitems
yanjinhuagood Aug 28, 2023
be53c5e
Update WPFDevelopers.SamplesCode.csproj
yanjinhuagood Aug 28, 2023
7e29fb3
Update Generic.xaml
yanjinhuagood Sep 1, 2023
57e0fca
Update Theme.xaml
yanjinhuagood Sep 1, 2023
5d47e60
Update Window.cs
yanjinhuagood Sep 1, 2023
974a120
Update Generic.xaml
yanjinhuagood Sep 1, 2023
aa85ad5
Update Theme.xaml
yanjinhuagood Sep 1, 2023
b18e719
Update Window.cs
yanjinhuagood Sep 1, 2023
fa8ca22
Update AMapTitleLayer.cs
yanjinhuagood Sep 1, 2023
fef4a0a
增加卫星地图
yanjinhuagood Sep 1, 2023
96a3cf0
Update WPFDevelopers.Samples40.csproj
yanjinhuagood Sep 1, 2023
6161103
Update WPFDevelopers.Samples45x.csproj
yanjinhuagood Sep 1, 2023
addd466
Update Styles.ComboBox.xaml
yanjinhuagood Sep 1, 2023
4d3fe43
Update NumericBox.xaml
yanjinhuagood Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/WPFDevelopers.Net40/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
<Setter Property="TitleBackground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="SnapsToDevicePixels" Value="True" />
Expand Down
73 changes: 70 additions & 3 deletions src/WPFDevelopers.Net40/Themes/Theme.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,7 @@
<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
<Setter Property="TitleBackground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="SnapsToDevicePixels" Value="True" />
Expand Down Expand Up @@ -1814,10 +1815,10 @@
</ControlTemplate.Resources>
<Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
<controls:SmallPanel>
<ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Press" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
<ContentPresenter x:Name="ContentSite" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" IsHitTestVisible="False" />
<TextBox x:Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" IsReadOnly="{TemplateBinding IsReadOnly}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" Visibility="Hidden" />
<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
<ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Press" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
<Popup x:Name="PART_Popup" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}" AllowsTransparency="True" Focusable="False" IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" StaysOpen="False">
<controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
<controls:SmallPanel.RenderTransform>
Expand Down Expand Up @@ -6176,7 +6177,7 @@
<RepeatButton x:Name="PART_NumericUp" Grid.Row="0" Margin="0,1,1,0" Padding="0" Command="{x:Static controls:NumericBox.IncreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
<controls:PathIcon Kind="ChevronUp" Style="{StaticResource WD.MiniPathIcon}" />
</RepeatButton>
<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Padding="0" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False">
<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Padding="0" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
<controls:PathIcon Kind="ChevronDown" Style="{StaticResource WD.MiniPathIcon}" />
</RepeatButton>
</Grid>
Expand Down Expand Up @@ -6354,7 +6355,7 @@
</UniformGrid>
<UniformGrid Grid.Column="1" Rows="1" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HSL}}">
<StackPanel>
<TextBox helpers:TextBoxHelper.AllowOnlyNumericInput="True" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.HToColorConverter}}" />
<TextBox helpers:TextBoxHelper.AllowOnlyNumericInput="True" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.MaxValue="360" helpers:TextBoxHelper.MinValue="0" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.HToColorConverter}}" />
<TextBlock Text="H" />
</StackPanel>
<StackPanel Grid.Column="1">
Expand All @@ -6378,6 +6379,72 @@
</Setter>
</Style>
<Style BasedOn="{StaticResource WD.ColorPicker}" TargetType="{x:Type controls:ColorPicker}" />
<Style x:Key="WD.IPEditBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:IPEditBox}">
<Setter Property="BorderThickness" Value="1" />
<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:IPEditBox}">
<ControlTemplate.Resources>
<Style BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}">
<Setter Property="BorderThickness" Value="0" />
<Setter Property="helpers:TextBoxHelper.AllowOnlyNumericInput" Value="True" />
<Setter Property="helpers:TextBoxHelper.MaxValue" Value="255" />
<Setter Property="helpers:TextBoxHelper.MinValue" Value="0" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="HorizontalContentAlignment" Value="Center" />
</Style>
<Style TargetType="TextBlock">
<Setter Property="Text" Value="." />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
</ControlTemplate.Resources>
<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
<ScrollViewer HorizontalScrollBarVisibility="Auto">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBox x:Name="PART_TextBox1" />
<TextBlock Grid.Column="1" />
<TextBox x:Name="PART_TextBox2" Grid.Column="2" />
<TextBlock Grid.Column="3" />
<TextBox x:Name="PART_TextBox3" Grid.Column="4" />
<TextBlock Grid.Column="5" />
<TextBox x:Name="PART_TextBox4" Grid.Column="6" />
</Grid>
</ScrollViewer>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
</Trigger>
<MultiTrigger>
<MultiTrigger.Conditions>
<Condition Property="IsKeyboardFocused" Value="True" />
<Condition Property="IsMouseOver" Value="False" />
</MultiTrigger.Conditions>
<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
</MultiTrigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style BasedOn="{StaticResource WD.IPEditBox}" TargetType="{x:Type controls:IPEditBox}" />
<Style x:Key="WD.DatePickerCalendarStyle" BasedOn="{StaticResource {x:Type Calendar}}" TargetType="{x:Type Calendar}" />
<Style x:Key="WD.DefaultDatePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePicker}">
<Setter Property="IsTodayHighlighted" Value="True" />
Expand Down
2 changes: 1 addition & 1 deletion src/WPFDevelopers.Net40/Window.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class Window : System.Windows.Window
DependencyProperty.Register("TitleBar", typeof(object), typeof(Window), new PropertyMetadata(null));

public static readonly DependencyProperty TitleBackgroundProperty =
DependencyProperty.Register("TitleBackground", typeof(Brush), typeof(Window), new PropertyMetadata(ControlsHelper.PrimaryNormalBrush));
DependencyProperty.Register("TitleBackground", typeof(Brush), typeof(Window), new PropertyMetadata(null));

static Window()
{
Expand Down
1 change: 1 addition & 0 deletions src/WPFDevelopers.Net45x/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
<Setter Property="TitleBackground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="SnapsToDevicePixels" Value="True" />
Expand Down
Loading