[Primitives] Fix namespace

Move from Aardvark.UI to Aardvark.UI.Primitives namespace
aardvark-platform · Jul 18, 2024 · 52f3bd8 · 52f3bd8
1 parent 5de96b2
commit 52f3bd8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git 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
 
 [<AutoOpen>]

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
 
 [<ModelType>]
 type Model =