Sharp8N/BrightSharp.Toolkit
1
0
Fork 0
mirror of https://github.com/VitalickS/BrightSharp.Toolkit.git synced 2026-03-21 02:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Grid snaps for ZoomControl, not critical Theme corrections, new demo set

Browse Source
This commit is contained in:
Vitali Semianiaka
2019-06-22 00:42:22 +03:00
parent 70aada3d59
commit 5da5856308
11 changed files with 395 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BrightSharp/Diagrams/Adorners/SizeAdorner.cs
View File

@@ -11,7 +11,7 @@ namespace BrightSharp.Diagrams
{
private SizeChrome chrome;
private VisualCollection visuals;
private ContentControl designerItem;
private FrameworkElement designerItem;
protected override int VisualChildrenCount
{
@@ -21,7 +21,7 @@ namespace BrightSharp.Diagrams
}
}
public SizeAdorner(ContentControl designerItem)
public SizeAdorner(FrameworkElement designerItem)
: base(designerItem)
{
SnapsToDevicePixels = true;

22
BrightSharp/Diagrams/SelectionBehavior.cs
View File

@@ -10,7 +10,7 @@ namespace BrightSharp.Diagrams
{
public static void Attach(FrameworkElement fe)
{
ContentControl selectedControl = null;
FrameworkElement selectedControl = null;
Style designerStyle = (Style)Application.Current.FindResource("DesignerItemStyle");
if (fe is Panel)
{
@@ -29,12 +29,15 @@ namespace BrightSharp.Diagrams
selectedControl = null;
return;
}
foreach (var control in fePanel.Children.OfType<ContentControl>())
foreach (var control in fePanel.Children.OfType<FrameworkElement>())
{
if (ProcessControl(control, clickedElement, ref selectedControl))
{
e.Handled = selectedControl.Content is ButtonBase;
return;
if (selectedControl is ContentControl cc && cc.Content is ButtonBase)
{
e.Handled = true;
return;
}
}
}
@@ -58,12 +61,15 @@ namespace BrightSharp.Diagrams
selectedControl = null;
return;
}
foreach (var control in feItemsControl.Items.OfType<ContentControl>())
foreach (var control in feItemsControl.Items.OfType<FrameworkElement>())
{
if (ProcessControl(control, clickedElement, ref selectedControl))
{
e.Handled = selectedControl.Content is ButtonBase;
return;
if (selectedControl is ContentControl cc && cc.Content is ButtonBase)
{
e.Handled = true;
return;
}
}
}
@@ -72,7 +78,7 @@ namespace BrightSharp.Diagrams
}
}
private static bool ProcessControl(ContentControl control, ContentControl clickedElement, ref ContentControl selectedControl)
private static bool ProcessControl(FrameworkElement control, FrameworkElement clickedElement, ref FrameworkElement selectedControl)
{
if (control == clickedElement && control != selectedControl)
{

43
BrightSharp/Diagrams/Thumbs/MoveThumb.cs
View File

@@ -11,44 +11,61 @@ namespace BrightSharp.Diagrams
public class MoveThumb : Thumb
{
private RotateTransform rotateTransform;
private ContentControl designerItem;
private FrameworkElement designerItem;
private static int? zIndex = null;
public MoveThumb() {
public MoveThumb()
{
DragStarted += MoveThumb_DragStarted;
DragDelta += MoveThumb_DragDelta;
DragCompleted += MoveThumb_DragCompleted;
}
private void MoveThumb_DragCompleted(object sender, DragCompletedEventArgs e) {
private void MoveThumb_DragCompleted(object sender, DragCompletedEventArgs e)
{
//TODO Need think about ZIndex changes
}
private void MoveThumb_DragStarted(object sender, DragStartedEventArgs e) {
designerItem = DataContext as ContentControl;
private void MoveThumb_DragStarted(object sender, DragStartedEventArgs e)
{
designerItem = DataContext as FrameworkElement;
if (designerItem != null) {
if (designerItem != null)
{
rotateTransform = designerItem.RenderTransform as RotateTransform;
if (designerItem.GetBindingExpression(Panel.ZIndexProperty) == null) {
if (designerItem.GetBindingExpression(Panel.ZIndexProperty) == null)
{
zIndex = Math.Max(zIndex ?? 0, Panel.GetZIndex(designerItem));
Panel.SetZIndex(designerItem, zIndex.Value + 1);
}
}
}
private void MoveThumb_DragDelta(object sender, DragDeltaEventArgs e) {
if (designerItem != null) {
private void MoveThumb_DragDelta(object sender, DragDeltaEventArgs e)
{
if (designerItem != null)
{
Point dragDelta = new Point(e.HorizontalChange, e.VerticalChange);
if (rotateTransform != null) {
var zoomControl = designerItem.Parent as dynamic;
double.TryParse(zoomControl.Tag as string, out var gridSize);
if (rotateTransform != null)
{
dragDelta = rotateTransform.Transform(dragDelta);
}
if (double.IsNaN(Canvas.GetLeft(designerItem))) Canvas.SetLeft(designerItem, 0);
if (double.IsNaN(Canvas.GetTop(designerItem))) Canvas.SetTop(designerItem, 0);
Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + dragDelta.X);
Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + dragDelta.Y);
var newLeft = Canvas.GetLeft(designerItem) + dragDelta.X;
var newTop = Canvas.GetTop(designerItem) + dragDelta.Y;
if (gridSize > 0)
{
newLeft = Math.Truncate(newLeft / gridSize) * gridSize;
newTop = Math.Truncate(newTop / gridSize) * gridSize;
}
Canvas.SetLeft(designerItem, newLeft);
Canvas.SetTop(designerItem, newTop);
}
}

96
BrightSharp/Diagrams/Thumbs/ResizeThumb.cs
View File

@@ -16,8 +16,8 @@ namespace BrightSharp.Diagrams
private double angle;
private Adorner adorner;
private Point transformOrigin;
private ContentControl designerItem;
private Canvas canvas;
private FrameworkElement designerItem;
private FrameworkElement canvas;
public ResizeThumb()
{
@@ -29,7 +29,7 @@ namespace BrightSharp.Diagrams
private void ResizeThumb_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
{
designerItem = designerItem ?? DataContext as ContentControl;
designerItem = designerItem ?? DataContext as FrameworkElement;
if (VerticalAlignment == VerticalAlignment.Top || VerticalAlignment == VerticalAlignment.Bottom)
{
@@ -47,7 +47,7 @@ namespace BrightSharp.Diagrams
if (designerItem != null)
{
canvas = VisualTreeHelper.GetParent(designerItem) as Canvas;
canvas = VisualTreeHelper.GetParent(designerItem) as FrameworkElement;
if (canvas != null)
{
@@ -83,44 +83,60 @@ namespace BrightSharp.Diagrams
if ((VerticalAlignment == VerticalAlignment.Top || VerticalAlignment == VerticalAlignment.Bottom) && double.IsNaN(designerItem.Height)) designerItem.Height = designerItem.ActualHeight;
if ((HorizontalAlignment == HorizontalAlignment.Left || HorizontalAlignment == HorizontalAlignment.Right) && double.IsNaN(designerItem.Width)) designerItem.Width = designerItem.ActualWidth;
switch (VerticalAlignment)
{
case System.Windows.VerticalAlignment.Bottom:
deltaVertical = Math.Min(-e.VerticalChange, designerItem.ActualHeight - designerItem.MinHeight);
deltaVertical = Math.Max(deltaVertical, designerItem.ActualHeight - designerItem.MaxHeight);
Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + (transformOrigin.Y * deltaVertical * (1 - Math.Cos(-angle))));
Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) - deltaVertical * transformOrigin.Y * Math.Sin(-angle));
designerItem.Height -= deltaVertical;
break;
case System.Windows.VerticalAlignment.Top:
deltaVertical = Math.Min(e.VerticalChange, designerItem.ActualHeight - designerItem.MinHeight);
deltaVertical = Math.Max(deltaVertical, designerItem.ActualHeight - designerItem.MaxHeight);
Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + deltaVertical * Math.Cos(-angle) + (transformOrigin.Y * deltaVertical * (1 - Math.Cos(-angle))));
Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + deltaVertical * Math.Sin(-angle) - (transformOrigin.Y * deltaVertical * Math.Sin(-angle)));
designerItem.Height -= deltaVertical;
break;
default:
break;
}
var zoomControl = designerItem.Parent as dynamic;
double.TryParse(zoomControl.Tag as string, out var gridSize);
switch (HorizontalAlignment)
var verticalChange = e.VerticalChange;
var horizontalChange = e.HorizontalChange;
if (gridSize > 0)
{
case System.Windows.HorizontalAlignment.Left:
deltaHorizontal = Math.Min(e.HorizontalChange, designerItem.ActualWidth - designerItem.MinWidth);
deltaHorizontal = Math.Max(deltaHorizontal, designerItem.ActualWidth - designerItem.MaxWidth);
Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + deltaHorizontal * Math.Sin(angle) - transformOrigin.X * deltaHorizontal * Math.Sin(angle));
Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + deltaHorizontal * Math.Cos(angle) + (transformOrigin.X * deltaHorizontal * (1 - Math.Cos(angle))));
designerItem.Width -= deltaHorizontal;
break;
case System.Windows.HorizontalAlignment.Right:
deltaHorizontal = Math.Min(-e.HorizontalChange, designerItem.ActualWidth - designerItem.MinWidth);
deltaHorizontal = Math.Max(deltaHorizontal, designerItem.ActualWidth - designerItem.MaxWidth);
Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) - transformOrigin.X * deltaHorizontal * Math.Sin(angle));
Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + (deltaHorizontal * transformOrigin.X * (1 - Math.Cos(angle))));
designerItem.Width -= deltaHorizontal;
break;
default:
break;
verticalChange = Math.Truncate(verticalChange / gridSize) * gridSize;
horizontalChange = Math.Truncate(horizontalChange / gridSize) * gridSize;
}
if (verticalChange != 0)
{
switch (VerticalAlignment)
{
case System.Windows.VerticalAlignment.Bottom:
deltaVertical = Math.Min(-verticalChange, designerItem.ActualHeight - designerItem.MinHeight);
deltaVertical = Math.Max(deltaVertical, designerItem.ActualHeight - designerItem.MaxHeight);
Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + (transformOrigin.Y * deltaVertical * (1 - Math.Cos(-angle))));
Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) - deltaVertical * transformOrigin.Y * Math.Sin(-angle));
designerItem.Height -= deltaVertical;
break;
case System.Windows.VerticalAlignment.Top:
deltaVertical = Math.Min(verticalChange, designerItem.ActualHeight - designerItem.MinHeight);
deltaVertical = Math.Max(deltaVertical, designerItem.ActualHeight - designerItem.MaxHeight);
Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + deltaVertical * Math.Cos(-angle) + (transformOrigin.Y * deltaVertical * (1 - Math.Cos(-angle))));
Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + deltaVertical * Math.Sin(-angle) - (transformOrigin.Y * deltaVertical * Math.Sin(-angle)));
designerItem.Height -= deltaVertical;
break;
default:
break;
}
}
if (horizontalChange != 0)
{
switch (HorizontalAlignment)
{
case System.Windows.HorizontalAlignment.Left:
deltaHorizontal = Math.Min(horizontalChange, designerItem.ActualWidth - designerItem.MinWidth);
deltaHorizontal = Math.Max(deltaHorizontal, designerItem.ActualWidth - designerItem.MaxWidth);
Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) + deltaHorizontal * Math.Sin(angle) - transformOrigin.X * deltaHorizontal * Math.Sin(angle));
Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + deltaHorizontal * Math.Cos(angle) + (transformOrigin.X * deltaHorizontal * (1 - Math.Cos(angle))));
designerItem.Width -= deltaHorizontal;
break;
case System.Windows.HorizontalAlignment.Right:
deltaHorizontal = Math.Min(-horizontalChange, designerItem.ActualWidth - designerItem.MinWidth);
deltaHorizontal = Math.Max(deltaHorizontal, designerItem.ActualWidth - designerItem.MaxWidth);
Canvas.SetTop(designerItem, Canvas.GetTop(designerItem) - transformOrigin.X * deltaHorizontal * Math.Sin(angle));
Canvas.SetLeft(designerItem, Canvas.GetLeft(designerItem) + (deltaHorizontal * transformOrigin.X * (1 - Math.Cos(angle))));
designerItem.Width -= deltaHorizontal;
break;
default:
break;
}
}
}

9
BrightSharp/Diagrams/ZoomControl.cs
View File

@@ -67,6 +67,15 @@ namespace BrightSharp.Diagrams
public double GridSize
{
get { return (double)GetValue(GridSizeProperty); }
set { SetValue(GridSizeProperty, value); }
}
public static readonly DependencyProperty GridSizeProperty =
DependencyProperty.Register("GridSize", typeof(double), typeof(ZoomControl), new PropertyMetadata(0.0));
public double RenderZoom
{
get { return (double)GetValue(RenderZoomProperty); }

4
BrightSharp/Themes/Style.Classic.xaml
View File

@@ -212,7 +212,7 @@
<LinearGradientBrush x:Key="WindowBackgroundBrush">
<GradientStop Color="#EEE" />
</LinearGradientBrush>
<SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#FFC0C9E4" />
<SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#FFDFE1E8" />
<SolidColorBrush x:Key="GlyphBrush" Color="#444" />
<SolidColorBrush x:Key="LightColorBrush" Color="#DDD" />
<Color x:Key="OnWindowForegroundColor">Black</Color>
@@ -228,7 +228,7 @@
</GradientBrush.GradientStops>
</LinearGradientBrush>
<SolidColorBrush x:Key="ScrollBarBackgroundBrush" Color="#F0F0F0" />
<SolidColorBrush x:Key="HighLightForegroundBrush" Color="#FF500000" />
<SolidColorBrush x:Key="HighLightForegroundBrush" Color="#FF2E2020" />
<Color x:Key="UiForegroundColor">Black</Color>
<SolidColorBrush x:Key="UiForegroundBrush" Color="{DynamicResource UiForegroundColor}" />
<Color x:Key="SelectedBackgroundColor">#DEE4FF</Color>

30
BrightSharp/Themes/Theme.xaml
View File

@@ -83,6 +83,7 @@
<Setter Property="bs:MarkupExtensionProperties.CornerRadius" Value="{DynamicResource DefaultRadiusNormal}" />
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
@@ -2501,7 +2502,7 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Border IsHitTestVisible="False"
<Border
Grid.Row="0"
Background="{TemplateBinding bs:MarkupExtensionProperties.SpecialBrush}"
BorderBrush="{DynamicResource NormalBorderBrush}"
@@ -2540,11 +2541,11 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Border
<Border
Grid.Row="0"
Background="{TemplateBinding bs:MarkupExtensionProperties.SpecialBrush}"
BorderBrush="{DynamicResource NormalBorderBrush}"
BorderThickness="1" HorizontalAlignment="Left"
BorderThickness="1,1,1,0" HorizontalAlignment="Left"
CornerRadius="2,2,0,0" >
<ContentPresenter
Margin="4"
@@ -2637,6 +2638,7 @@
<Setter Property="Margin" Value="0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="bs:MarkupExtensionProperties.CornerRadius" Value="1" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -2654,6 +2656,7 @@
<Trigger Property="IsSelected" Value="true">
<Setter TargetName="Border" Property="Background" Value="{DynamicResource SelectedBackgroundBrush}"/>
<Setter Property="TextBlock.Foreground" Value="{DynamicResource HighLightForegroundBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource LightBorderBrush}" />
</Trigger>
<Trigger Property="IsSelected" Value="False">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource OnWindowForegroundBrush}"/>
@@ -2950,7 +2953,7 @@
<Setter Property="ItemsPanel">
<Setter.Value>
<ItemsPanelTemplate>
<DockPanel HorizontalAlignment="Stretch" />
<DockPanel HorizontalAlignment="Stretch" LastChildFill="False" />
</ItemsPanelTemplate>
</Setter.Value>
</Setter>
@@ -3541,7 +3544,8 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type RadioButton}">
<BulletDecorator Background="Transparent">
<BulletDecorator Background="Transparent"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<BulletDecorator.Bullet>
<Border>
<Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Width="13" Height="13">
@@ -4507,6 +4511,13 @@
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="ItemsPanel">
<Setter.Value>
<ItemsPanelTemplate>
<DockPanel HorizontalAlignment="Stretch" LastChildFill="False" />
</ItemsPanelTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="{x:Type TabControl}">
<Setter Property="OverridesDefaultStyle" Value="True" />
@@ -4721,6 +4732,7 @@
<Setter Property="CaretBrush" Value="{DynamicResource DisabledForegroundBrush}" />
<Setter Property="bs:MarkupExtensionProperties.SpecialBrush" Value="{DynamicResource PressedBorderBrush}" />
<Setter Property="bs:MarkupExtensionProperties.SpecialWidth" Value="300" />
<Setter Property="bs:MarkupExtensionProperties.SpecialHeight" Value="2" />
<Setter Property="Validation.ErrorTemplate">
<Setter.Value>
<ControlTemplate>
@@ -4827,7 +4839,7 @@
</Grid>
<Line Grid.Column="1" x:Name="FocusedLineHelper" VerticalAlignment="Top"
Margin="5,1"
X2="32" IsHitTestVisible="False" Stroke="{TemplateBinding bs:MarkupExtensionProperties.SpecialBrush}" StrokeThickness="2"
X2="48" IsHitTestVisible="False" Stroke="{TemplateBinding bs:MarkupExtensionProperties.SpecialBrush}" StrokeThickness="{TemplateBinding bs:MarkupExtensionProperties.SpecialHeight}"
Visibility="Collapsed" StrokeEndLineCap="Triangle" StrokeStartLineCap="Triangle" />
</Grid>
@@ -4959,9 +4971,9 @@
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="MinHeight" Value="10" />
<Setter Property="MinWidth" Value="20" />
<Setter Property="Padding" Value="5,3" />
<Setter Property="MinHeight" Value="16" />
<Setter Property="MinWidth" Value="16" />
<Setter Property="Padding" Value="2" />
<Setter Property="bs:MarkupExtensionProperties.CornerRadius" Value="{DynamicResource DefaultRadiusNormal}" />
<Setter Property="Template">
<Setter.Value>