Skip to content

Commit

Permalink
Increasing version to 4.3 and applying Clean Code with CodeMaid
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dirkster99
Dirkster99 committed Jul 15, 2020
1 parent dc16d20 commit c5ed8d7
Show file tree
Hide file tree
Showing 8 changed files with 399 additions and 399 deletions.
6 changes: 3 additions & 3 deletions source/Components/AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.20</Version>
<AssemblyVersion>4.20</AssemblyVersion>
<FileVersion>4.20</FileVersion>
<Version>4.30</Version>
<AssemblyVersion>4.30</AssemblyVersion>
<FileVersion>4.30</FileVersion>
<Company>Open Source</Company>
<Product>Dirkster.AvalonDock</Product>
<Copyright>2017-2020</Copyright>
Expand Down
6 changes: 3 additions & 3 deletions source/Components/AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.20</Version>
<AssemblyVersion>4.20</AssemblyVersion>
<FileVersion>4.20</FileVersion>
<Version>4.30</Version>
<AssemblyVersion>4.30</AssemblyVersion>
<FileVersion>4.30</FileVersion>
<Company>Open Source</Company>
<Product>Dirkster.AvalonDock</Product>
<Copyright>2017-2020</Copyright>
Expand Down
6 changes: 3 additions & 3 deletions source/Components/AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.20</Version>
<AssemblyVersion>4.20</AssemblyVersion>
<FileVersion>4.20</FileVersion>
<Version>4.30</Version>
<AssemblyVersion>4.30</AssemblyVersion>
<FileVersion>4.30</FileVersion>
<Company>Open Source</Company>
<Product>Dirkster.AvalonDock</Product>
<Copyright>2017-2020</Copyright>
Expand Down
6 changes: 3 additions & 3 deletions source/Components/AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.20</Version>
<AssemblyVersion>4.20</AssemblyVersion>
<FileVersion>4.20</FileVersion>
<Version>4.30</Version>
<AssemblyVersion>4.30</AssemblyVersion>
<FileVersion>4.30</FileVersion>
<Company>Open Source</Company>
<Product>Dirkster.AvalonDock</Product>
<Copyright>2017-2020</Copyright>
Expand Down
6 changes: 3 additions & 3 deletions source/Components/AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.20</Version>
<AssemblyVersion>4.20</AssemblyVersion>
<FileVersion>4.20</FileVersion>
<Version>4.30</Version>
<AssemblyVersion>4.30</AssemblyVersion>
<FileVersion>4.30</FileVersion>
<Company>Open Source</Company>
<Product>Dirkster.AvalonDock</Product>
<Copyright>2017-2020</Copyright>
Expand Down
6 changes: 3 additions & 3 deletions source/Components/AvalonDock/AvalonDock.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.20</Version>
<AssemblyVersion>4.20</AssemblyVersion>
<FileVersion>4.20</FileVersion>
<Version>4.30</Version>
<AssemblyVersion>4.30</AssemblyVersion>
<FileVersion>4.30</FileVersion>
<Company>Open Source</Company>
<Product>Dirkster.AvalonDock</Product>
<Copyright>2017-2020</Copyright>
Expand Down
248 changes: 124 additions & 124 deletions source/Components/AvalonDock/Controls/LayoutDocumentControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,128 +16,128 @@ This program is provided to you under the terms of the Microsoft Public

namespace AvalonDock.Controls
{
/// <summary>
/// Implements the content part of the document control.
/// It hosts a <see cref="LayoutDocument"/> as its <see cref="Model"/>.
/// </summary>
public class LayoutDocumentControl : Control
{
#region Constructors

/// <summary>
/// Static class constructor
/// </summary>
static LayoutDocumentControl()
{
DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutDocumentControl), new FrameworkPropertyMetadata(typeof(LayoutDocumentControl)));
FocusableProperty.OverrideMetadata(typeof(LayoutDocumentControl), new FrameworkPropertyMetadata(true));
}

#endregion Constructors

#region Properties

#region Model

/// <summary><see cref="Model"/> dependency property.</summary>
public static readonly DependencyProperty ModelProperty = DependencyProperty.Register(nameof(Model), typeof(LayoutContent), typeof(LayoutDocumentControl),
new FrameworkPropertyMetadata(null, OnModelChanged));

/// <summary>
/// Gets or sets the <see cref="Model"/> property.
/// This dependency property indicates the model attached to this view.
/// </summary>
public LayoutContent Model
{
get => (LayoutContent)GetValue(ModelProperty);
set => SetValue(ModelProperty, value);
}

/// <summary>Handles changes to the <see cref="Model"/> property.</summary>
private static void OnModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutDocumentControl)d).OnModelChanged(e);

/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Model"/> property.</summary>
protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
{
if (e.OldValue != null) ((LayoutContent)e.OldValue).PropertyChanged -= Model_PropertyChanged;
if (Model != null)
{
Model.PropertyChanged += Model_PropertyChanged;
SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model));
}
else
SetLayoutItem(null);
}

private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName != nameof(LayoutContent.IsEnabled)) return;
if (Model == null) return;
IsEnabled = Model.IsEnabled;
if (IsEnabled || !Model.IsActive) return;
if (Model.Parent is LayoutDocumentPane layoutDocumentPane) layoutDocumentPane.SetNextSelectedIndex();
}

#endregion Model

#region LayoutItem

/// <summary><see cref="LayoutItem"/> Read-Only dependency property.</summary>
private static readonly DependencyPropertyKey LayoutItemPropertyKey = DependencyProperty.RegisterReadOnly(nameof(LayoutItem), typeof(LayoutItem), typeof(LayoutDocumentControl),
new FrameworkPropertyMetadata(null));

public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty;

/// <summary>
/// Gets the <see cref="LayoutItem"/> property. This dependency property
/// indicates the LayoutItem attached to this tag item.
/// </summary>
public LayoutItem LayoutItem => (LayoutItem)GetValue(LayoutItemProperty);

/// <summary>
/// Provides a secure method for setting the <see cref="LayoutItem"/> property.
/// This dependency property indicates the LayoutItem attached to this tag item.
/// </summary>
/// <param name="value">The new value for the property.</param>
protected void SetLayoutItem(LayoutItem value) => SetValue(LayoutItemPropertyKey, value);

#endregion LayoutItem

#endregion Properties

#region Overrides

/// <inheritdoc />
protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
{
Debug.WriteLine($"{nameof(OnPreviewMouseLeftButtonUp)}: {LayoutItem.ContentId}");
SetIsActive();
base.OnPreviewMouseLeftButtonUp(e);
}

/// <inheritdoc />
protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
{
SetIsActive();
base.OnMouseLeftButtonDown(e);
}

/// <inheritdoc />
protected override void OnMouseRightButtonDown(MouseButtonEventArgs e)
{
SetIsActive();
base.OnMouseLeftButtonDown(e);
}

#endregion Overrides

#region Private Methods

private void SetIsActive()
{
if (Model != null && !Model.IsActive) Model.IsActive = true;
}

#endregion Private Methods
}
/// <summary>
/// Implements the content part of the document control.
/// It hosts a <see cref="LayoutDocument"/> as its <see cref="Model"/>.
/// </summary>
public class LayoutDocumentControl : Control
{
#region Constructors

/// <summary>
/// Static class constructor
/// </summary>
static LayoutDocumentControl()
{
DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutDocumentControl), new FrameworkPropertyMetadata(typeof(LayoutDocumentControl)));
FocusableProperty.OverrideMetadata(typeof(LayoutDocumentControl), new FrameworkPropertyMetadata(true));
}

#endregion Constructors

#region Properties

#region Model

/// <summary><see cref="Model"/> dependency property.</summary>
public static readonly DependencyProperty ModelProperty = DependencyProperty.Register(nameof(Model), typeof(LayoutContent), typeof(LayoutDocumentControl),
new FrameworkPropertyMetadata(null, OnModelChanged));

/// <summary>
/// Gets or sets the <see cref="Model"/> property.
/// This dependency property indicates the model attached to this view.
/// </summary>
public LayoutContent Model
{
get => (LayoutContent)GetValue(ModelProperty);
set => SetValue(ModelProperty, value);
}

/// <summary>Handles changes to the <see cref="Model"/> property.</summary>
private static void OnModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((LayoutDocumentControl)d).OnModelChanged(e);

/// <summary>Provides derived classes an opportunity to handle changes to the <see cref="Model"/> property.</summary>
protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
{
if (e.OldValue != null) ((LayoutContent)e.OldValue).PropertyChanged -= Model_PropertyChanged;
if (Model != null)
{
Model.PropertyChanged += Model_PropertyChanged;
SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model));
}
else
SetLayoutItem(null);
}

private void Model_PropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName != nameof(LayoutContent.IsEnabled)) return;
if (Model == null) return;
IsEnabled = Model.IsEnabled;
if (IsEnabled || !Model.IsActive) return;
if (Model.Parent is LayoutDocumentPane layoutDocumentPane) layoutDocumentPane.SetNextSelectedIndex();
}

#endregion Model

#region LayoutItem

/// <summary><see cref="LayoutItem"/> Read-Only dependency property.</summary>
private static readonly DependencyPropertyKey LayoutItemPropertyKey = DependencyProperty.RegisterReadOnly(nameof(LayoutItem), typeof(LayoutItem), typeof(LayoutDocumentControl),
new FrameworkPropertyMetadata(null));

public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty;

/// <summary>
/// Gets the <see cref="LayoutItem"/> property. This dependency property
/// indicates the LayoutItem attached to this tag item.
/// </summary>
public LayoutItem LayoutItem => (LayoutItem)GetValue(LayoutItemProperty);

/// <summary>
/// Provides a secure method for setting the <see cref="LayoutItem"/> property.
/// This dependency property indicates the LayoutItem attached to this tag item.
/// </summary>
/// <param name="value">The new value for the property.</param>
protected void SetLayoutItem(LayoutItem value) => SetValue(LayoutItemPropertyKey, value);

#endregion LayoutItem

#endregion Properties

#region Overrides

/// <inheritdoc />
protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
{
Debug.WriteLine($"{nameof(OnPreviewMouseLeftButtonUp)}: {LayoutItem.ContentId}");
SetIsActive();
base.OnPreviewMouseLeftButtonUp(e);
}

/// <inheritdoc />
protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
{
SetIsActive();
base.OnMouseLeftButtonDown(e);
}

/// <inheritdoc />
protected override void OnMouseRightButtonDown(MouseButtonEventArgs e)
{
SetIsActive();
base.OnMouseLeftButtonDown(e);
}

#endregion Overrides

#region Private Methods

private void SetIsActive()
{
if (Model != null && !Model.IsActive) Model.IsActive = true;
}

#endregion Private Methods
}
}
Loading

0 comments on commit c5ed8d7

Please sign in to comment.