From 52f3bd8242ee0ed7df1c142100fb59274e89c9bd Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 18 Jul 2024 16:40:56 +0200 Subject: [PATCH] [Primitives] Fix namespace Move from Aardvark.UI to Aardvark.UI.Primitives namespace --- src/Aardvark.UI.Primitives/Notifications/Notifications.fs | 1 + .../Primitives/UI.Primitives.Models.fs | 2 +- src/Aardvark.UI.Primitives/Primitives/UI.Primitives.fs | 5 +++-- .../10 - Drawing3D/RenderingParametersApp.fs | 1 + src/Examples (dotnetcore)/15 - Svg/App.fs | 3 +-- src/Scratch/01 - PerfTest/Model.fs | 6 +++--- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Aardvark.UI.Primitives/Notifications/Notifications.fs b/src/Aardvark.UI.Primitives/Notifications/Notifications.fs index 2860ec2e..4d9f1895 100644 --- a/src/Aardvark.UI.Primitives/Notifications/Notifications.fs +++ b/src/Aardvark.UI.Primitives/Notifications/Notifications.fs @@ -1,6 +1,7 @@ namespace Aardvark.UI.Primitives.Notifications open Aardvark.UI +open Aardvark.UI.Primitives open FSharp.Data.Adaptive [] diff --git a/src/Aardvark.UI.Primitives/Primitives/UI.Primitives.Models.fs b/src/Aardvark.UI.Primitives/Primitives/UI.Primitives.Models.fs index 5fa0ca06..0a4f5ed1 100644 --- a/src/Aardvark.UI.Primitives/Primitives/UI.Primitives.Models.fs +++ b/src/Aardvark.UI.Primitives/Primitives/UI.Primitives.Models.fs @@ -1,4 +1,4 @@ -namespace Aardvark.UI +namespace Aardvark.UI.Primitives open Aardvark.Base open FSharp.Data.Adaptive diff --git a/src/Aardvark.UI.Primitives/Primitives/UI.Primitives.fs b/src/Aardvark.UI.Primitives/Primitives/UI.Primitives.fs index 0a47e4d3..44e51121 100644 --- a/src/Aardvark.UI.Primitives/Primitives/UI.Primitives.fs +++ b/src/Aardvark.UI.Primitives/Primitives/UI.Primitives.fs @@ -1,4 +1,4 @@ -namespace Aardvark.UI +namespace Aardvark.UI.Primitives open System @@ -7,6 +7,7 @@ open FSharp.Data.Adaptive open Aardvark.UI open Aardvark.UI.Operators +open Aardvark.UI.Primitives @@ -85,7 +86,7 @@ module Html = onBoot' ["chDocumentTitle", AVal.channel title] code node let semui = - Primitives.SimplePrimitives.Html.semui + SimplePrimitives.Html.semui let multiselectList (entries : list<'a>) (getId : 'a -> string) (getDomNode : 'a -> DomNode<'msg>) (getValue : string -> 'a) (onSelected : list<'a> -> 'msg) = div [attribute "style" "width:100%"] [ diff --git a/src/Examples (dotnetcore)/10 - Drawing3D/RenderingParametersApp.fs b/src/Examples (dotnetcore)/10 - Drawing3D/RenderingParametersApp.fs index 4a851cc2..6de1a0da 100644 --- a/src/Examples (dotnetcore)/10 - Drawing3D/RenderingParametersApp.fs +++ b/src/Examples (dotnetcore)/10 - Drawing3D/RenderingParametersApp.fs @@ -2,6 +2,7 @@ open Aardvark.Rendering open Aardvark.UI +open Aardvark.UI.Primitives open RenderingParametersModel diff --git a/src/Examples (dotnetcore)/15 - Svg/App.fs b/src/Examples (dotnetcore)/15 - Svg/App.fs index 506da141..301a1e6f 100644 --- a/src/Examples (dotnetcore)/15 - Svg/App.fs +++ b/src/Examples (dotnetcore)/15 - Svg/App.fs @@ -7,7 +7,6 @@ open Aardvark.Base open FSharp.Data.Adaptive open Aardvark.Rendering open Model -open Aardvark.UI.Html let (%) (v : V2d) (f : float) = V2d(f * float (int v.X / int f), f * float (int v.Y / int f)) @@ -58,7 +57,7 @@ let view (model : AdaptiveModel) = ) ] br [] - SemUi.dropDown model.dragMode SetDragMode + Html.SemUi.dropDown model.dragMode SetDragMode br [] text "StepSize " Numeric.numericField (SetStepSize >> Seq.singleton) AttributeMap.empty model.stepSize Slider diff --git a/src/Scratch/01 - PerfTest/Model.fs b/src/Scratch/01 - PerfTest/Model.fs index a237d86e..7d934a3a 100644 --- a/src/Scratch/01 - PerfTest/Model.fs +++ b/src/Scratch/01 - PerfTest/Model.fs @@ -12,9 +12,9 @@ type Message = | Tick of float | ToggleAnimation - | SetUpdateLoad of Aardvark.UI.Numeric.Action - | SetGpuLoad of Aardvark.UI.Numeric.Action - | SetModLoad of Aardvark.UI.Numeric.Action + | SetUpdateLoad of Numeric.Action + | SetGpuLoad of Numeric.Action + | SetModLoad of Numeric.Action [] type Model =