Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
775a59e
chore(vscode): set dotnet.defaultSolution; disable cmake.configureOnOpen
BinToss Jul 5, 2023
8ff736c
build(groupbox, deps, sample, vscode): upgrade Avalonia to 11.0.0-rc2.2
BinToss Jul 5, 2023
19af994
build(groupbox): update Copyright to 2018-2023
BinToss Jul 5, 2023
708c0fb
chore(vscode): sort settings
BinToss Jul 5, 2023
7da8fb6
chore(vscode): add tasks created by ms-dotnettools.csdevkit
BinToss Jul 5, 2023
d1e32ed
build(groupbox): improve Description; fix type in PackageTags
BinToss Jul 5, 2023
ced8b9b
refactor(groupbox): change GroupBox to AXAML
BinToss Jul 5, 2023
75759b2
style(groupbox): format GroupBox.axaml
BinToss Jul 5, 2023
ec978b0
refactor(groupbox): change Default style to AXAML
BinToss Jul 5, 2023
d6c744c
fix(sample): update App for Avalonia 11 changes
BinToss Jul 5, 2023
c31999d
refactor(sample): change MainWindow to AXAML
BinToss Jul 5, 2023
c9e3ef6
fix(groupbox): add missing 'partial' modifier to GroupBox
BinToss Jul 5, 2023
e69ab4a
style(groupbox): remove unnecessary Using
BinToss Jul 5, 2023
9ccf331
fix(sample): add missing 'partial' modifier to Sample.App
BinToss Jul 5, 2023
ff642f8
refactor(groupbox): remove deprecated interface 'IStyleable'
BinToss Jul 5, 2023
48b385f
fix(sample): add missing 'partial' modifier to MainWindow
BinToss Jul 5, 2023
13c1121
fix(groupbox, sample): remove handwritten IntializeComponent()
BinToss Jul 5, 2023
93a0200
build(deps-dev): add Microsoft.SourceLink.GitHub
BinToss Jul 5, 2023
6e9505f
chore(release): 2.0.0-rc2.2
BinToss Jul 5, 2023
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
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/Sample/bin/Debug/netcoreapp3.0/Sample.dll",
"program": "${workspaceFolder}/Sample/bin/Debug/net6.0/Sample.dll",
"args": [],
"cwd": "${workspaceFolder}",
"console": "internalConsole",
Expand All @@ -23,4 +23,4 @@
"processId": "${command:pickProcess}"
}
]
}
}
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"cmake.configureOnOpen": false,
"dotnet.defaultSolution": "GroupBox.sln"
}
40 changes: 33 additions & 7 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,39 @@
"tasks": [
{
"label": "build",
"command": "dotnet build /p:GenerateFullPaths=true",
"type": "shell",
"group": "build",
"presentation": {
"reveal": "silent"
},
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/GroupBox.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/GroupBox.sln",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"--project",
"${workspaceFolder}/Sample/Sample.csproj"
],
"problemMatcher": "$msCompile"
}
]
}
}
55 changes: 55 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Change Log

All notable changes to this project will be documented in this file. See [versionize](https://github.com/versionize/versionize) for commit guidelines.

<a name="2.0.0-rc2.2"></a>
## [2.0.0-rc2.2](https://www.github.com/BinToss/teast.GroupBox.Avalonia/releases/tag/v2.0.0-rc2.2) (2023-7-5)

### Bug Fixes

* **groupbox:** add missing 'partial' modifier to GroupBox ([c9e3ef6](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/c9e3ef6d620936dc8e68f262bf7e1ec394832a2e))
* **groupbox, sample:** remove handwritten IntializeComponent() ([13c1121](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/13c1121abfb459aaa47ffd83e51fc95e2e377dd1))
* **sample:** add missing 'partial' modifier to MainWindow ([48b385f](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/48b385f554fa2f52ee14b43b6d194f272cc61f30))
* **sample:** add missing 'partial' modifier to Sample.App ([9ccf331](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/9ccf331236cba8d2d04312cb00c3cae59667fcc1))
* **sample:** update App for Avalonia 11 changes ([d6c744c](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/d6c744c955be30fdde081f0339737f08bbf14c85))

### Breaking Changes

* **groupbox, deps, sample, vscode:** upgrade Avalonia to 11.0.0-rc2.2 ([8ff736c](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/8ff736c1edf3809d9a807e4941e3b05e65013214))

### Other

* **deps-dev:** add Microsoft.SourceLink.GitHub ([93a0200](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/93a02006e2d2f49035ba4ddd3adf092cbcf1cccf))
* **groupbox:** change Default style to AXAML ([ec978b0](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/ec978b0a734f27439ef3976a9dd055aa2d36a5aa))
* **groupbox:** change GroupBox to AXAML ([ced8b9b](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/ced8b9bc6c70146027d604f2841d4a78221ecacc))
* **groupbox:** format GroupBox.axaml ([75759b2](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/75759b28f6a0e45732539305c51e041b6e7b8cd9))
* **groupbox:** improve Description; fix type in PackageTags ([d1e32ed](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/d1e32ed9a74a59239e1597bd738eccbc58b7ef72))
* **groupbox:** remove deprecated interface 'IStyleable' ([ff642f8](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/ff642f863f4538549310e4039cfb1018593bc6ed))
* **groupbox:** remove unnecessary Using ([e69ab4a](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/e69ab4ad09dc6471cea910d54b44a65ed62f4ef1))
* **groupbox:** update Copyright to 2018-2023 ([19af994](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/19af994ff320d50e50437263599411c09527c0f7))
* **sample:** change MainWindow to AXAML ([c31999d](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/c31999d89bf3c9bb41e53b5fa8c27b115500fa96))
* **vscode:** add tasks created by ms-dotnettools.csdevkit ([7da8fb6](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/7da8fb6101b91455aff90843d43aaa4d26a4639e))
* **vscode:** set dotnet.defaultSolution; disable cmake.configureOnOpen ([775a59e](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/775a59ea75e960edbb7bf1978a693d1074500055))
* **vscode:** sort settings ([708c0fb](https://www.github.com/BinToss/teast.GroupBox.Avalonia/commit/708c0fbeb4553462c64d3737668303822c2334b1))

<a name="1.2.1-preview5"></a>
## 1.2.1-preview5

### Bug Fixes

* move styling into its own file
* add support for border and content margin

<a name="1.2.0.0-preview5"></a>
## 1.2.0.0-preview5

### Features

* bump Avalonia to 0.10.0-preview5

<a name="1.1.0.0"></a>
## 1.1.1.0

### Features

* bump Avalonia to 0.9.12
10 changes: 10 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project>
<PropertyGroup>
<AvaloniaVersion>11.0.0-rc2.2</AvaloniaVersion>
</PropertyGroup>

<ItemGroup>
<!-- show this file in Solution Explorer/View -->
<None Include="$(MSBuildThisFileFullPath)" />
</ItemGroup>
</Project>
95 changes: 47 additions & 48 deletions GroupBox.sln
Original file line number Diff line number Diff line change
@@ -1,48 +1,47 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GroupBox", "GroupBox\GroupBox.csproj", "{1E2912DE-0D83-420C-968D-77CD3E9F766A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{B3B77768-332A-4F7D-87EB-CB66150E1B1B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x64.ActiveCfg = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x64.Build.0 = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x86.ActiveCfg = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x86.Build.0 = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|Any CPU.Build.0 = Release|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x64.ActiveCfg = Release|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x64.Build.0 = Release|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x86.ActiveCfg = Release|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x86.Build.0 = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x64.ActiveCfg = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x64.Build.0 = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x86.ActiveCfg = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x86.Build.0 = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|Any CPU.Build.0 = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x64.ActiveCfg = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x64.Build.0 = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x86.ActiveCfg = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 17.0.31903.59
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GroupBox", "GroupBox\GroupBox.csproj", "{1E2912DE-0D83-420C-968D-77CD3E9F766A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{B3B77768-332A-4F7D-87EB-CB66150E1B1B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x64.ActiveCfg = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x64.Build.0 = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x86.ActiveCfg = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Debug|x86.Build.0 = Debug|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|Any CPU.Build.0 = Release|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x64.ActiveCfg = Release|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x64.Build.0 = Release|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x86.ActiveCfg = Release|Any CPU
{1E2912DE-0D83-420C-968D-77CD3E9F766A}.Release|x86.Build.0 = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x64.ActiveCfg = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x64.Build.0 = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x86.ActiveCfg = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Debug|x86.Build.0 = Debug|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|Any CPU.Build.0 = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x64.ActiveCfg = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x64.Build.0 = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x86.ActiveCfg = Release|Any CPU
{B3B77768-332A-4F7D-87EB-CB66150E1B1B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
37 changes: 37 additions & 0 deletions GroupBox/GroupBox.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:teast="clr-namespace:Teast.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Teast.Controls.GroupBox">
<UserControl.Styles>
<Style Selector="teast|GroupBox">
<Setter Property="Template">
<ControlTemplate>
<Border
BorderThickness="{TemplateBinding BorderThickness}"
BorderBrush="{TemplateBinding BorderBrush}">
<Grid
RowDefinitions="Auto,*"
ColumnDefinitions="*">
<DockPanel
LastChildFill="True"
Grid.Row="0"
Background="{TemplateBinding HeaderBackground}">
<TextBlock
Text="{TemplateBinding Header}"
Margin="{TemplateBinding HeaderMargin}"
Foreground="{TemplateBinding HeaderForeground}" />
</DockPanel>
<ContentControl
Grid.Row="1"
Content="{TemplateBinding Content}"
Margin="{TemplateBinding Margin}" />
</Grid>
</Border>
</ControlTemplate>
</Setter>
</Style>
</UserControl.Styles>
</UserControl>
Loading