diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2021-08-02 13:13:21 +0200 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2021-08-02 13:13:21 +0200 |
| commit | 85190e474cae0a87e29755c156140cd29c85cbb5 (patch) | |
| tree | 5d13272e927994c5ff3f1fc48999254c90007de9 /Samples/common | |
| parent | 61d58bc83b6e4af1a7e98e30c3fbdaf31388026a (diff) | |
merge vkvg2 into devel
Diffstat (limited to 'Samples/common')
| -rw-r--r-- | Samples/common/src/Editor.cs | 2 | ||||
| -rw-r--r-- | Samples/common/src/SampleBase.cs | 4 | ||||
| -rw-r--r-- | Samples/common/ui/Interfaces/TemplatedControl/testEnumSelector.crow | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Samples/common/src/Editor.cs b/Samples/common/src/Editor.cs index 686afaed..22418f31 100644 --- a/Samples/common/src/Editor.cs +++ b/Samples/common/src/Editor.cs @@ -6,7 +6,7 @@ using System; using Glfw; using Crow.Text; using System.Collections.Generic; -using Crow.Cairo; +using Crow.Drawing; using System.Threading.Tasks; using System.Linq; using System.Diagnostics.CodeAnalysis; diff --git a/Samples/common/src/SampleBase.cs b/Samples/common/src/SampleBase.cs index 8d7718ed..9784304a 100644 --- a/Samples/common/src/SampleBase.cs +++ b/Samples/common/src/SampleBase.cs @@ -10,6 +10,8 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; +using Crow.Drawing; + namespace Samples { public class SampleBase : Interface @@ -376,7 +378,7 @@ namespace Samples initCommands(); base.OnInitialized(); } - protected override void processDrawing(Crow.Cairo.Context ctx) + protected override void processDrawing(Context ctx) { base.processDrawing(ctx); } diff --git a/Samples/common/ui/Interfaces/TemplatedControl/testEnumSelector.crow b/Samples/common/ui/Interfaces/TemplatedControl/testEnumSelector.crow index 63590efd..1e6e03fa 100644 --- a/Samples/common/ui/Interfaces/TemplatedControl/testEnumSelector.crow +++ b/Samples/common/ui/Interfaces/TemplatedControl/testEnumSelector.crow @@ -1,6 +1,6 @@ <?xml version="1.0"?> <VerticalStack Spacing="5" Margin="5"> - <EnumSelector Caption="Vertical Alignemnt" EnumValue="{²CurrentVAlign}" Width="200"> + <EnumSelector Caption="Vertical Alignemnt" EnumValue="{²CurrentVAlign}" Width="200" Background="Onyx"> <Template> <Popper Caption="{./Caption}" CornerRadius="{./CornerRadius}" Foreground="{./Foreground}" Background="{./Background}"> <Template> |