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

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)
{