Skip to content
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

#174 Migrating AutoWindowSizeWhenOpened to DockingManager #175

Merged
merged 6 commits into from
Jul 7, 2020
+1,758 −1,764
Merged

#174 Migrating AutoWindowSizeWhenOpened to DockingManager #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0569383
#174 Migrating AutoWindowSizeWhenOpened to DockingManager
LyonJack Jul 4, 2020
8db4f44
Update README.md
Dirkster99 Jul 5, 2020
202b674
Modify Demo
LyonJack Jul 5, 2020
dbdbc92
Code Cleanup
Dirkster99 Jul 5, 2020
e18c098
Fix #177
LyonJack Jul 6, 2020
236ec3b
Merge branch 'master' of https://github.com/LyonJack/AvalonDock
LyonJack Jul 6, 2020
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
15 changes: 8 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.svg)](http://nuget.org/packages/Dirkster.AvalonDock) | Dirkster.AvalonDock |
| ------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------- |
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.Themes.Aero.svg)](http://nuget.org/packages/Dirkster.AvalonDock.Themes.Aero) | Dirkster.AvalonDock.Themes.Aero |
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.Themes.Expression.svg)](http://nuget.org/packages/Dirkster.AvalonDock.Themes.Expression) | Dirkster.AvalonDock.Themes.Expression |
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.Themes.Metro.svg)](http://nuget.org/packages/Dirkster.AvalonDock.Themes.Metro) | Dirkster.AvalonDock.Themes.Metro |
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.Themes.VS2010.svg)](http://nuget.org/packages/Dirkster.AvalonDock.Themes.VS2010) | Dirkster.AvalonDock.Themes.VS2010 |
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.Themes.VS2013.svg)](http://nuget.org/packages/Dirkster.AvalonDock.Themes.VS2013) | [Dirkster.AvalonDock.Themes.VS2013](https://github.com/Dirkster99/AvalonDock/wiki/WPF-VS-2013-Dark-Light-Demo-Client) |
| Downloads | Packages | NuGet
| :------------------------------------------------------------------------------------------------------------------------------------------------------ | :----------------------------------------- | :--------------------------------------------------------------------------------
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.svg)](http://nuget.org/packages/Dirkster.AvalonDock) | Dirkster.AvalonDock | [Dirkster.AvalonDock](http://nuget.org/packages/Dirkster.AvalonDock)
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.Themes.Aero.svg)](http://nuget.org/packages/Dirkster.AvalonDock.Themes.Aero) | Dirkster.AvalonDock.Themes.Aero | [Dirkster.AvalonDock.Themes.Aero](http://nuget.org/packages/Dirkster.AvalonDock.Themes.Aero)
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.Themes.Expression.svg)](http://nuget.org/packages/Dirkster.AvalonDock.Themes.Expression) | Dirkster.AvalonDock.Themes.Expression | [Dirkster.AvalonDock.Themes.Expression](http://nuget.org/packages/Dirkster.AvalonDock.Themes.Expression)
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.Themes.Metro.svg)](http://nuget.org/packages/Dirkster.AvalonDock.Themes.Metro) | Dirkster.AvalonDock.Themes.Metro | [Dirkster.AvalonDock.Themes.Metro](http://nuget.org/packages/Dirkster.AvalonDock.Themes.Metro)
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.Themes.VS2010.svg)](http://nuget.org/packages/Dirkster.AvalonDock.Themes.VS2010) | Dirkster.AvalonDock.Themes.VS2010 | [Dirkster.AvalonDock.Themes.VS2010](http://nuget.org/packages/Dirkster.AvalonDock.Themes.VS2010)
| [![NuGet](https://img.shields.io/nuget/dt/Dirkster.AvalonDock.Themes.VS2013.svg)](http://nuget.org/packages/Dirkster.AvalonDock.Themes.VS2013) | [Dirkster.AvalonDock.Themes.VS2013](https://github.com/Dirkster99/AvalonDock/wiki/WPF-VS-2013-Dark-Light-Demo-Client) | [Dirkster.AvalonDock.Themes.VS2013](http://nuget.org/packages/Dirkster.AvalonDock.Themes.VS2013)

![Net4](https://badgen.net/badge/Framework/.Net 4/blue) ![NetCore3](https://badgen.net/badge/Framework/NetCore 3/blue)

Expand Down
2 changes: 1 addition & 1 deletion source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@

<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsActive}" Value="False" />
<Condition Binding="{Binding SelectedItem.IsActive, RelativeSource={RelativeSource Self}}" Value="False" />
</MultiDataTrigger.Conditions>
<Setter TargetName="BD" Property="BorderBrush" Value="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveBackground}}" />
</MultiDataTrigger>
Expand Down
58 changes: 29 additions & 29 deletions source/Components/AvalonDock/Commands/IExecuteWithObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
namespace AvalonDock.Commands
{
/// <summary>
/// Interface IExecuteWithObject
/// </summary>
internal interface IExecuteWithObject
{
#region Public Properties
/// <summary>
/// Interface IExecuteWithObject
/// </summary>
internal interface IExecuteWithObject
{
#region Public Properties

/// <summary>
/// The target of the WeakAction.
/// </summary>
/// <value>The target.</value>
object Target
{
get;
}
/// <summary>
/// The target of the WeakAction.
/// </summary>
/// <value>The target.</value>
object Target
{
get;
}

#endregion Public Properties
#endregion Public Properties

#region Public Methods
#region Public Methods

/// <summary>
/// Executes an action.
/// </summary>
/// <param name="parameter">A parameter passed as an object,
/// to be casted to the appropriate type.</param>
void ExecuteWithObject(object parameter);
/// <summary>
/// Executes an action.
/// </summary>
/// <param name="parameter">A parameter passed as an object,
/// to be casted to the appropriate type.</param>
void ExecuteWithObject(object parameter);

/// <summary>
/// Deletes all references, which notifies the cleanup method
/// that this entry must be deleted.
/// </summary>
void MarkForDeletion();
/// <summary>
/// Deletes all references, which notifies the cleanup method
/// that this entry must be deleted.
/// </summary>
void MarkForDeletion();

#endregion Public Methods
}
#endregion Public Methods
}
}
30 changes: 15 additions & 15 deletions source/Components/AvalonDock/Commands/IExecuteWithObjectAndResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
namespace AvalonDock.Commands
{
/// <summary>
/// Interface IExecuteWithObjectAndResult
/// </summary>
internal interface IExecuteWithObjectAndResult
{
#region Public Methods
/// <summary>
/// Interface IExecuteWithObjectAndResult
/// </summary>
internal interface IExecuteWithObjectAndResult
{
#region Public Methods

/// <summary>
/// Executes a Func and returns the result.
/// </summary>
/// <param name="parameter">A parameter passed as an object,
/// to be casted to the appropriate type.</param>
/// <returns>The result of the operation.</returns>
object ExecuteWithObject(object parameter);
/// <summary>
/// Executes a Func and returns the result.
/// </summary>
/// <param name="parameter">A parameter passed as an object,
/// to be casted to the appropriate type.</param>
/// <returns>The result of the operation.</returns>
object ExecuteWithObject(object parameter);

#endregion Public Methods
}
#endregion Public Methods
}
}
2 changes: 1 addition & 1 deletion source/Components/AvalonDock/Commands/NamespaceDoc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ namespace AvalonDock.Commands
internal class NamespaceDoc
{
}
}
}
Loading