Skip to content

Multiple bug fixes & improvements #280

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

Open
BornToBeRoot wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Multiple bug fixes & improvements #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
13953fe
Fix: #132
BornToBeRoot Nov 20, 2022
d109bc8
Chore: Use .NET 6
BornToBeRoot Nov 20, 2022
674cc97
Merge pull request #1 from BornToBeRoot/fix/132
BornToBeRoot Nov 20, 2022
cabbf7f
Feature: Use .NET 6 windows for NETworkManager
BornToBeRoot Nov 20, 2022
3789e2f
Chore: Remove xml file for docs
BornToBeRoot Jan 8, 2023
1bf7ca4
Fix: Remove warning NETSDK1137
BornToBeRoot Mar 13, 2023
eee793b
Feature: Upgrade to .net 8
BornToBeRoot Nov 15, 2023
2b70e0f
Fix: .NET 8 TargetFramework
BornToBeRoot Nov 15, 2023
02ff613
Feature: Parition binding
BornToBeRoot Apr 3, 2024
ac26a18
Merge pull request #2 from BornToBeRoot/feature/partition_binding
BornToBeRoot Apr 3, 2024
3075a3c
Docs: Add changelog
BornToBeRoot Apr 3, 2024
7ac6fe4
Fix: Consolidate branch, but don't close window (#3)
BornToBeRoot Apr 6, 2024
a8862e4
Docs: Remove fork note
BornToBeRoot Apr 6, 2024
71a830b
Docs: Update changelog
BornToBeRoot Apr 6, 2024
4fbcc3d
Feature: Disable consolidate branches (#4)
BornToBeRoot Apr 6, 2024
5275f5a
Docs: add changelog
BornToBeRoot Apr 6, 2024
5c74d0e
Merge branch 'master' into upstream/multiple-changes
BornToBeRoot Apr 6, 2024
ba69b7b
Delete CHANGELOG.md
BornToBeRoot Apr 6, 2024
0811014
Update README.md
BornToBeRoot Apr 6, 2024
b02519b
Update README.md
BornToBeRoot Apr 6, 2024
a757598
Fix: DisableBranchConsolidation
BornToBeRoot Apr 6, 2024
6bd4356
Merge branch 'master' into upstream/multiple-changes
BornToBeRoot Apr 6, 2024
dd00520
Docs: Changelog
BornToBeRoot Apr 6, 2024
d093dc6
Fix: MahApps brush
BornToBeRoot Apr 6, 2024
d65d689
Merge branch 'master' into upstream/multiple-changes
BornToBeRoot Apr 6, 2024
2df62f5
Fix: Update MahApps resource keys
BornToBeRoot Apr 7, 2024
b5c980e
Merge branch 'master' into upstream/multiple-changes
BornToBeRoot Apr 7, 2024
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
37 changes: 19 additions & 18 deletions Dragablz.Test/Dragablz.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0-windows;netcoreapp3.0;net45;net40</TargetFrameworks>
<PropertyGroup>
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PlatformTarget>x64</PlatformTarget>
<IsPackable>false</IsPackable>
</PropertyGroup>

<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="1.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FakeItEasy" Version="5.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="1.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FakeItEasy" Version="5.4.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Dragablz\Dragablz.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Dragablz\Dragablz.csproj" />
</ItemGroup>

</Project>
19 changes: 16 additions & 3 deletions Dragablz/Dockablz/Layout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.CodeDom;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
Expand Down Expand Up @@ -193,12 +192,26 @@ public static BranchResult Branch(TabablzControl tabablzControl, TabablzControl
return branchResult;
}

// Add parition as dependency property
public static readonly DependencyProperty PartitionProperty = DependencyProperty.Register(
"Partition", typeof (object), typeof (Layout), new PropertyMetadata(default(object)));

/// <summary>
/// Use in conjuction with the <see cref="InterTabController.Partition"/> on a <see cref="TabablzControl"/>
/// to isolate drag and drop spaces/control instances.
/// </summary>
public string Partition { get; set; }
public object Partition
{
get { return (object) GetValue(PartitionProperty); }
set { SetValue(PartitionProperty, value); }
}

/// <summary>
/// Use in conjuction with the <see cref="InterTabController.Partition"/> on a <see cref="TabablzControl"/>
/// to isolate drag and drop spaces/control instances.
/// </summary>
//public string Partition { get; set; }

public static readonly DependencyProperty InterLayoutClientProperty = DependencyProperty.Register(
"InterLayoutClient", typeof (IInterLayoutClient), typeof (Layout), new PropertyMetadata(new DefaultInterLayoutClient()));

Expand Down Expand Up @@ -450,7 +463,7 @@ private static void SetupParticipatingLayouts(DragablzItem dragablzItem)
if (draggingWindow == null) return;

foreach (var loadedLayout in LoadedLayouts.Where(l =>
l.Partition == dragablzItem.PartitionAtDragStart &&
l.Partition?.ToString() == dragablzItem.PartitionAtDragStart &&
!Equals(Window.GetWindow(l), draggingWindow)))

{
Expand Down
55 changes: 28 additions & 27 deletions Dragablz/Dragablz.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0-windows;netcoreapp3.0;net45;net40</TargetFrameworks>
<UseWPF>true</UseWPF>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PackageIconUrl>https://raw.githubusercontent.com/ButchersBoy/Dragablz/master/Resources/D32.png</PackageIconUrl>
<PackageLicenseExpression></PackageLicenseExpression>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>http://dragablz.net</PackageProjectUrl>
<RepositoryUrl>https://github.com/ButchersBoy/Dragablz</RepositoryUrl>
<PackageTags>WPF TabControl Tab Tearable</PackageTags>
<PackageReleaseNotes>Support for .Net Core 3.0</PackageReleaseNotes>
<RepositoryType>git</RepositoryType>
<DocumentationFile>..\bin\Release\Dragablz.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PlatformTarget>x64</PlatformTarget>
<UseWPF>true</UseWPF>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PackageIconUrl>https://raw.githubusercontent.com/ButchersBoy/Dragablz/master/Resources/D32.png</PackageIconUrl>
<PackageLicenseExpression></PackageLicenseExpression>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>http://dragablz.net</PackageProjectUrl>
<RepositoryUrl>https://github.com/ButchersBoy/Dragablz</RepositoryUrl>
<PackageTags>WPF TabControl Tab Tearable</PackageTags>
<PackageReleaseNotes>Support for .NET 8</PackageReleaseNotes>
<RepositoryType>git</RepositoryType>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\bin\Debug</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\bin\Debug</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\bin\Release</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\bin\Release</OutputPath>
</PropertyGroup>

<ItemGroup>
<None Include="..\LICENSE">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<None Include="..\LICENSE">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

</Project>
Loading