diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2025-03-05 00:03:57 +0100 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2025-03-05 00:03:57 +0100 |
| commit | 232b019ff2e8ceeaef63c0fd9207a3d193d2046e (patch) | |
| tree | 5f8126ff01ea005ece482aa0d6352fb58974637b | |
| parent | 54687bd5dcf322096a8c8cf8dbc1374cb5ce49f9 (diff) | |
update versions
| -rw-r--r-- | Backends/CairoBackend/Crow.CairoBackend.csproj | 2 | ||||
| -rw-r--r-- | Crow/src/Widgets/Widget.cs | 2 | ||||
| -rw-r--r-- | Directory.Build.props | 3 | ||||
| -rw-r--r-- | Drawing2D/Drawing2D.csproj | 2 | ||||
| -rw-r--r-- | Drawing2D/src/CharLocation.cs | 2 | ||||
| -rw-r--r-- | Drawing2D/src/TextBuffer.cs | 2 | ||||
| -rw-r--r-- | Samples/common/ui/Interfaces/Divers/colorSlider.crow | 58 | ||||
| -rw-r--r-- | Samples/common/ui/Interfaces/Divers/colorSlider2.crow | 78 |
8 files changed, 7 insertions, 142 deletions
diff --git a/Backends/CairoBackend/Crow.CairoBackend.csproj b/Backends/CairoBackend/Crow.CairoBackend.csproj index 6b15a45e..60a301ce 100644 --- a/Backends/CairoBackend/Crow.CairoBackend.csproj +++ b/Backends/CairoBackend/Crow.CairoBackend.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <TargetFramework>netcoreapp3.1</TargetFramework> - <AssemblyVersion>1.2.1</AssemblyVersion> + <AssemblyVersion>1.2.3</AssemblyVersion> <PackageVersion>$(AssemblyVersion)-beta</PackageVersion> <Title>C.R.O.W Cairo Backend</Title> diff --git a/Crow/src/Widgets/Widget.cs b/Crow/src/Widgets/Widget.cs index 5e47dd6b..8c0dfc4f 100644 --- a/Crow/src/Widgets/Widget.cs +++ b/Crow/src/Widgets/Widget.cs @@ -1719,7 +1719,7 @@ namespace Crow //apply constraints depending on parent type Parent.ChildrenLayoutingConstraints (this, ref layoutType); - // //prevent queueing same LayoutingType for this + //prevent queueing same LayoutingType for this layoutType &= (~RegisteredLayoutings); if (layoutType == LayoutingType.None) diff --git a/Directory.Build.props b/Directory.Build.props index f3f829df..13f567f6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,9 +4,8 @@ <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath> <License>MIT</License> <Authors>Jean-Philippe Bruyère</Authors> - <LangVersion>7.3</LangVersion> - <CrowVersion>1.3.2</CrowVersion> + <CrowVersion>1.3.3</CrowVersion> <CrowPackageVersion>$(CrowVersion)-beta</CrowPackageVersion> <!-- If you dont have a native libstb on your system, enable the managed version of stb here diff --git a/Drawing2D/Drawing2D.csproj b/Drawing2D/Drawing2D.csproj index d1c3f10f..9af041b5 100644 --- a/Drawing2D/Drawing2D.csproj +++ b/Drawing2D/Drawing2D.csproj @@ -4,7 +4,7 @@ <TargetFramework>netstandard2.1</TargetFramework> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <AssemblyVersion>1.2.1</AssemblyVersion> + <AssemblyVersion>1.2.3</AssemblyVersion> <PackageVersion>$(AssemblyVersion)-beta</PackageVersion> <Title>Drawing 2D Library</Title> diff --git a/Drawing2D/src/CharLocation.cs b/Drawing2D/src/CharLocation.cs index 345f8fa3..761274d1 100644 --- a/Drawing2D/src/CharLocation.cs +++ b/Drawing2D/src/CharLocation.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2021 Jean-Philippe Bruyère <jp_bruyere@hotmail.com> +// Copyright (c) 2013-2025 Jean-Philippe Bruyère <jp_bruyere@hotmail.com> // // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System; diff --git a/Drawing2D/src/TextBuffer.cs b/Drawing2D/src/TextBuffer.cs index ff85e2ff..25deb5fe 100644 --- a/Drawing2D/src/TextBuffer.cs +++ b/Drawing2D/src/TextBuffer.cs @@ -19,7 +19,7 @@ namespace CrowEditBase public bool mixedLineBreak = false; public string lineBreak = null; - internal LineCollection GetLineListCopy() => new LineCollection(lines.ToArray()); + public LineCollection GetLineListCopy() => new LineCollection(lines.ToArray()); public Span<char> Span => buffer.Span.Slice(0, length); public ReadOnlySpan<char> ReadOnlySpan => buffer.Span.Slice(0, length); public bool IsEmpty => length == 0; diff --git a/Samples/common/ui/Interfaces/Divers/colorSlider.crow b/Samples/common/ui/Interfaces/Divers/colorSlider.crow index 012fd2dd..a7cda8c3 100644 --- a/Samples/common/ui/Interfaces/Divers/colorSlider.crow +++ b/Samples/common/ui/Interfaces/Divers/colorSlider.crow @@ -1,7 +1,7 @@ <VerticalStack Margin="50" Spacing="20" Background="DimGrey"> <HorizontalStack Height="Fit" Width="400" Spacing="5" Margin="5" Background="Jet"> <Label Style="labColor" Text="G:"/> - <ColorSlider Name="cs" Component="Red" CurrentColor="Green" CursorType="Circle" ClipToClientRect="false" Background="Black" Margin="5" Height="20" /> + <ColorSlider Name="cs" Component="Red" CurrentColor="Green" ClipToClientRect="false" Background="Black" Margin="5" Height="20" /> <Label Style="labColorV" Text="{../cs.CurrentValue}" /> <Container Width="100" Height="100" Background="Red" Margin="5"> <Widget Width="20" Height="20" Background="Blue" HorizontalAlignment="Left" VerticalAlignment="Top"/> @@ -16,60 +16,4 @@ </Container> </Template> </Slider> - <Slider Background="RoyalBlue" Height="50" Width="400" CursorSize="50" Inverted="{../../inverted.IsChecked}"> - <Template> - <Group Background="DarkGrey" > - <ColorGauge Height="50%" Background="Onyx" Value="{./Value}" Maximum="{./Maximum}" Minimum="{Minimum}" Orientation="{./Orientation}" - Inverted="{./Inverted}"/> - <Container Name="Cursor" Background="White" > - <Label Text="{./Value}" Foreground="Black"/> - </Container> - </Group> - </Template> - </Slider> - <ColorPicker> - <Template> - <Border Background="{./Background}" Foreground="{./Foreground}" Width="Stretched" - CornerRadius="{./CornerRadius}" BorderWidth="1"> - <VerticalStack Margin="2"> - <Widget Width="30" Height="16" Background="{./CurrentColor}"/> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="R:"/> - <ColorSlider Name="cs" Component="Red" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="G:"/> - <ColorSlider Name="cs" Component="Green" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="B:"/> - <ColorSlider Name="cs" Component="Blue" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="A:"/> - <ColorSlider Name="cs" Component="Alpha" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="H:"/> - <ColorSlider Name="cs" Component="Hue" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="S:"/> - <ColorSlider Name="cs" Component="Saturation" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="V:"/> - <ColorSlider Name="cs" Component="Value" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - </VerticalStack> - </Border> - </Template> - </ColorPicker> </VerticalStack>
\ No newline at end of file diff --git a/Samples/common/ui/Interfaces/Divers/colorSlider2.crow b/Samples/common/ui/Interfaces/Divers/colorSlider2.crow deleted file mode 100644 index 111ce06f..00000000 --- a/Samples/common/ui/Interfaces/Divers/colorSlider2.crow +++ /dev/null @@ -1,78 +0,0 @@ -<VerticalStack Margin="50" Spacing="20" Background="DimGrey"> - <Label Text="{../slider1.Value}"/> - <Slider Background="Onyx" Height="30" Width="400" > - <Template> - <Group Background="{./Background}"> - <ColorGauge Component="Red" Height="Stretched" Value="{./Value}" Maximum="{./Maximum}" Minimum="{Minimum}" Orientation="{./Orientation}" Margin="11" - Inverted="{./Inverted}"/> - <Border Name="Cursor" Foreground="White" CornerRadius="7" BorderWidth="2"> - <Label Text="{./Value}" Foreground="WhiteSmoke"/> - </Border> - </Group> - </Template> - </Slider> - <Slider Background="Onyx" Height="30" Width="400" CursorSize="20" > - <Template> - <Group Background="{./Background}" ClipToClientRect="false"> - <ColorGauge Component="Red" Height="Stretched" Value="{./Value}" Maximum="{./Maximum}" Minimum="{Minimum}" Orientation="{./Orientation}" Margin="10" ClipToClientRect="false" - Inverted="{./Inverted}"/> - <Shape Height="Stretched" Name="Cursor" Size="30,30" Path="M 0,30 L 15,0 L 30,30 Z G" StrokeWidth="1" ClipToClientRect="false" Scaled="false" /> - </Group> - </Template> - </Slider> - <ColorPicker> - <Template> - <Border Background="{./Background}" Foreground="{./Foreground}" Width="Stretched" - CornerRadius="{./CornerRadius}" BorderWidth="1"> - <VerticalStack Margin="2"> - <Widget Width="50" Height="30" CornerRadius="10" Background="{./CurrentColor}"/> - <Slider Background="Onyx" Height="Fit" Width="Stretched" Foreground="{²./CurrentColor}" Maximum="255" Value="{².cg.Value}"> - <Template> - <Group Background="{./Background}"> - <ColorGauge Name="cg" Component="Red" Height="Stretched" Value="{²./Value}" Maximum="{./Maximum}" Minimum="{Minimum}" Orientation="{./Orientation}" Margin="0" CurrentColor="{²./Foreground}"/> - <Border Name="Cursor" Foreground="White" CornerRadius="7" BorderWidth="2"> - <Label Text="{./Value}" Foreground="WhiteSmoke"/> - </Border> - </Group> - </Template> - </Slider> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="R:"/> - <ColorSlider Name="cs" Component="Red" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="G:"/> - <ColorSlider Name="cs" Component="Green" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="B:"/> - <ColorSlider Name="cs" Component="Blue" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="A:"/> - <ColorSlider Name="cs" Component="Alpha" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="H:"/> - <ColorSlider Name="cs" Component="Hue" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="S:"/> - <ColorSlider Name="cs" Component="Saturation" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - <HorizontalStack Height="Fit"> - <Label Style="labColor" Text="V:"/> - <ColorSlider Name="cs" Component="Value" CurrentColor="{²./CurrentColor}"/> - <Label Style="labColorV" Text="{../cs.CurrentValue}" /> - </HorizontalStack> - </VerticalStack> - </Border> - </Template> - </ColorPicker> -</VerticalStack>
\ No newline at end of file |