stuff

Author: igagis

src/ruis/context.cpp

@@ -25,16 +25,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 using namespace ruis;
 
-context::context(
-	utki::shared_ref<ruis::style_provider> style_provider,
-	utki::shared_ref<ruis::render::renderer> renderer,
-	utki::shared_ref<ruis::updater> updater,
-	parameters params
-) :
+context::context(parameters params) :
 	post_to_ui_thread_function(std::move(params.post_to_ui_thread_function)),
-	style_provider(std::move(style_provider)),
-	renderer(std::move(renderer)),
-	updater(std::move(updater)),
+	style_provider(std::move(params.style_provider)),
+	renderer(std::move(params.renderer)),
+	updater(std::move(params.updater)),
 	localization(std::move(params.localization)),
 	units(std::move(params.units))
 {

src/ruis/context.hpp

@@ -140,24 +140,18 @@ class context : public std::enable_shared_from_this<context>
 
 	struct parameters {
 		std::function<void(std::function<void()>)> post_to_ui_thread_function;
-		ruis::units units;
+		utki::shared_ref<ruis::updater> updater;
+		utki::shared_ref<ruis::render::renderer> renderer;
+		utki::shared_ref<ruis::style_provider> style_provider;
 		utki::shared_ref<ruis::localization> localization = utki::make_shared<ruis::localization>();
-		// TODO: add style_provider field
+		ruis::units units;
 	};
 
 	/**
 	 * @brief Constructor.
-	 * @param style_provider - style provider to use for this context.
-	 * @param renderer - ruis  renderer for this context.
-	 * @param updater - updater to use along with this context.
 	 * @param params - context parameters.
 	 */
-	context(
-		utki::shared_ref<ruis::style_provider> style_provider,
-		utki::shared_ref<ruis::render::renderer> renderer,
-		utki::shared_ref<ruis::updater> updater,
-		parameters params
-	);
+	context(parameters params);
 
 	context(const context&) = delete;
 	context& operator=(const context&) = delete;

tests/harness/modules/ruis-render-null

@@ -7,20 +7,20 @@ utki::shared_ref<ruis::context> make_dummy_context(){
     auto rendering_context = utki::make_shared<ruis::render::null::context>();
     auto common_objects = utki::make_shared<ruis::render::renderer::objects>(rendering_context);
     return utki::make_shared<ruis::context>(
-        utki::make_shared<ruis::style_provider>(
-            utki::make_shared<ruis::resource_loader>(
-                rendering_context,//
-                common_objects
-            )
-        ),
-        utki::make_shared<ruis::render::renderer>(
-            rendering_context,//
-            rendering_context.get().make_shaders(),
-            common_objects
-        ),
-        utki::make_shared<ruis::updater>(),
         ruis::context::parameters{
             .post_to_ui_thread_function = [](std::function<void()>){},
+            .updater = utki::make_shared<ruis::updater>(),
+            .renderer = utki::make_shared<ruis::render::renderer>(
+                rendering_context,//
+                rendering_context.get().make_shaders(),
+                common_objects
+            ),
+            .style_provider = utki::make_shared<ruis::style_provider>(
+                utki::make_shared<ruis::resource_loader>(
+                    rendering_context,//
+                    common_objects
+                )
+            ),
             .units = ruis::units(
                 ruis::real(96), //
                 ruis::real(1)