modified some styles
This commit is contained in:
1 parent
f8e03c131c
commit
65c967a5e6
4 files changed
+7
-10
No files matched your search
@@ -7,11 +7,9 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
|
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
|
||||||
xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
|
xmlns:userControl="clr-namespace:HandyControlDemo.UserControl"
|
||||||
xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
|
xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl">
|
||||||
d:DesignHeight="3000"
|
<ScrollViewer HorizontalScrollBarVisibility="Auto">
|
||||||
d:DesignWidth="2400">
|
<Canvas HorizontalAlignment="Center" VerticalAlignment="Center" Name="CanvasMain" Margin="32" Width="1665" Height="1300" Effect="{StaticResource EffectShadow5}">
|
||||||
<ScrollViewer>
|
|
||||||
<Canvas Name="CanvasMain" Margin="32" Height="3000" Effect="{StaticResource EffectShadow5}">
|
|
||||||
<Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4">
|
<Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<Button Width="80" Content="Button" Margin="0,0,0,10"/>
|
<Button Width="80" Content="Button" Margin="0,0,0,10"/>
|
||||||
@@ -349,7 +347,7 @@
|
|||||||
<Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Canvas.Top="976">
|
<Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="611" Canvas.Top="976">
|
||||||
<userControl:CoverFlowDemoCtl Width="563" Margin="-32" Background="Transparent"/>
|
<userControl:CoverFlowDemoCtl Width="563" Margin="-32" Background="Transparent"/>
|
||||||
</Border>
|
</Border>
|
||||||
<Border Visibility="Visible" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1391" Canvas.Top="648" Width="274">
|
<Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1391" Canvas.Top="648" Width="274">
|
||||||
<userControl:ColorPickerDemoCtl Margin="-32" Background="Transparent"/>
|
<userControl:ColorPickerDemoCtl Margin="-32" Background="Transparent"/>
|
||||||
</Border>
|
</Border>
|
||||||
<Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113" Canvas.Top="608" Width="264" Height="126">
|
<Border Visibility="Collapsed" BorderThickness="1" Padding="16" Style="{StaticResource BorderRegion}" CornerRadius="4" Canvas.Left="1113" Canvas.Top="608" Width="264" Height="126">
|
||||||
@@ -361,7 +359,6 @@
|
|||||||
<controls:Tag ShowCloseButton="False" Content="TextText"/>
|
<controls:Tag ShowCloseButton="False" Content="TextText"/>
|
||||||
</controls:TagPanel>
|
</controls:TagPanel>
|
||||||
</Border>
|
</Border>
|
||||||
<!--<Border Visibility="Collapsed" Width="14" Height="14" Background="Black" Canvas.Left="290" Canvas.Top="1040"/>-->
|
|
||||||
</Canvas>
|
</Canvas>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -150,7 +150,7 @@
|
|||||||
|
|
||||||
<Style x:Key="RadioGroupItemBaseStyle" TargetType="RadioButton">
|
<Style x:Key="RadioGroupItemBaseStyle" TargetType="RadioButton">
|
||||||
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
||||||
<Setter Property="Background" Value="{DynamicResource DefaultBrush}"/>
|
<Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||||
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
|
<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
|
||||||
<Setter Property="BorderThickness" Value="1"/>
|
<Setter Property="BorderThickness" Value="1"/>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
<Style x:Key="RadioGroupBaseStyle" TargetType="controls:RadioGroup">
|
<Style x:Key="RadioGroupBaseStyle" TargetType="controls:RadioGroup">
|
||||||
<Setter Property="ItemsPanel" Value="{StaticResource RadioGroupHorizontalItemsPanelTemplate}"/>
|
<Setter Property="ItemsPanel" Value="{StaticResource RadioGroupHorizontalItemsPanelTemplate}"/>
|
||||||
<Setter Property="controls:TitleElement.BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
|
<Setter Property="controls:TitleElement.BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
|
||||||
<Setter Property="controls:TitleElement.Background" Value="{DynamicResource DefaultBrush}"/>
|
<Setter Property="controls:TitleElement.Background" Value="{DynamicResource RegionBrush}"/>
|
||||||
<Setter Property="controls:TitleElement.Foreground" Value="{DynamicResource PrimaryBrush}"/>
|
<Setter Property="controls:TitleElement.Foreground" Value="{DynamicResource PrimaryBrush}"/>
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<Trigger Property="Orientation" Value="Vertical">
|
<Trigger Property="Orientation" Value="Vertical">
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
|
|
||||||
<Style x:Key="TransferGroupBaseStyle" TargetType="controls:TransferGroup">
|
<Style x:Key="TransferGroupBaseStyle" TargetType="controls:TransferGroup">
|
||||||
<Setter Property="BorderThickness" Value="0"/>
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}"/>
|
<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
|
||||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
|
|||||||
Reference in new issue
Block a user