remove scroll_area from tree_view implementation

Author: igagis

src/ruis/widget/group/tree_view.cpp

@@ -42,33 +42,19 @@ tree_view::tree_view( //
 		std::move(params.layout_params),
 		std::move(params.widget_params)
 	),
-	scroll_area(this->context, {}, {}),
-	item_list(
-		// clang-format off
-		ruis::make::list(this->context,
-			{
-				.layout_params = {
-					.dims = {ruis::dim::min, ruis::dim::max}
-				},
-				.oriented_params = {
-					.vertical = true
-				}
+	list(this->context,
+		{
+			.oriented_params{
+				.vertical = true
 			}
-		)
-		// clang-format on
+		}
 	)
 {
-	this->push_back(this->item_list);
-
-	this->item_list.get().model_change_handler = [this](list&) {
-		this->notify_view_change();
-	};
-
-	this->item_list.get().scroll_change_handler = [this](list&) {
+	this->list::model_change_handler = [this](list&) {
 		this->notify_view_change();
 	};
 
-	this->scroll_area::scroll_change_handler = [this](scroll_area& sa) {
+	this->list::scroll_change_handler = [this](list&) {
 		this->notify_view_change();
 	};
 
@@ -85,14 +71,14 @@ void tree_view::notify_view_change()
 void tree_view::set_provider(std::shared_ptr<provider> item_provider)
 {
 	if (!item_provider) {
-		this->item_list.get().set_provider(nullptr);
+		this->list::set_provider(nullptr);
 		return;
 	}
 
 	// TODO: why do we need to do the notification here?
 	item_provider->notify_model_change();
 
-	this->item_list.get().set_provider(
+	this->list::set_provider(
 		// use aliasing shared_ptr constructor becasue list::provider
 		// is a private base of tree_view::provider, so not possible
 		// to use std::static_pointer_cast() because it does not see the

src/ruis/widget/group/tree_view.hpp

@@ -28,17 +28,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "../widget.hpp"
 
 #include "list.hpp"
-#include "scroll_area.hpp"
 
 namespace ruis {
 
 // NOLINTNEXTLINE(bugprone-incorrect-enable-shared-from-this, "std::shared_from_this is public via widget")
 class tree_view :
 	virtual public widget, //
-	private scroll_area
+	private list
 {
-	utki::shared_ref<list> item_list;
-
 public:
 	/**
 	 * @brief tree_view item provider base class.
@@ -49,7 +46,10 @@ class tree_view :
 	{
 		friend class tree_view;
 
-		void recycle(size_t index, utki::shared_ref<widget> w) override;
+		void recycle(
+			size_t index, //
+			utki::shared_ref<widget> w
+		) override;
 
 		utki::shared_ref<widget> get_widget(size_t index) override;
 
@@ -214,45 +214,21 @@ class tree_view :
 	 * @brief Set vertical scroll position by factor.
 	 * @param factor - new scroll position specified by factor from [0:1].
 	 */
-	void set_vertical_scroll_factor(real factor)
-	{
-		this->item_list.get().set_scroll_factor(factor);
-	}
-
-	/**
-	 * @brief Set horizontal scroll position by factor.
-	 * @param factor - new scroll position specified by factor from [0:1].
-	 */
-	void set_horizontal_scroll_factor(real factor)
-	{
-		this->set_scroll_factor(vector2(factor, 0));
-	}
+	using list::set_scroll_factor;
 
 	/**
 	 * @brief Get scroll position.
-	 * @return Vector of (horizontal scroll factor, vertical scroll factor).
+	 * @return Scroll factor.
 	 */
-	vector2 get_scroll_factor() const
-	{
-		return vector2(
-			this->scroll_area::get_scroll_factor().x(), //
-			this->item_list.get().get_scroll_factor()
-		);
-	}
+	using list::get_scroll_factor;
 
 	/**
 	 * @brief Get scroll band.
 	 * Get scroll band size.
 	 * The scroll band size is a fraction of [0:1] interval.
-	 * @return Vector of (horizontal scroll band, vertical scroll band).
+	 * @return Vertical scroll band.
 	 */
-	vector2 get_scroll_band() const noexcept
-	{
-		return vector2(
-			this->scroll_area::get_visible_area_fraction().x(), //
-			this->item_list.get().get_scroll_band()
-		);
-	}
+	using list::get_scroll_band;
 
 private:
 	void notify_view_change();

tests/app/src/tree_view_window.cpp

@@ -3,9 +3,11 @@
 #include <ruis/widget/group/tree_view.hpp>
 #include <ruis/widget/slider/scroll_bar.hpp>
 #include <ruis/widget/button/push_button.hpp>
+#include <ruis/widget/group/scroll_area.hpp>
 #include <ruis/default_style.hpp>
 
 using namespace std::string_literals;
+using namespace std::string_view_literals;
 
 using namespace ruis::length_literals;
 
@@ -311,18 +313,21 @@ utki::shared_ref<ruis::window> make_tree_view_window(
                     }
                 },
                 {
-                    m::pile(c,
+                    m::scroll_area(c,
                         {
                             .layout_params{
-                                .dims{ruis::dim::fill, ruis::dim::max},
+                                .dims{ruis::dim::fill, ruis::dim::fill},
                                 .weight = 1
+                            },
+                            .widget_params{
+                                .id = "tree_view_scroll_area"s
                             }
                         },
                         {
                             m::tree_view(c,
                                 {
                                     .layout_params{
-                                        .dims{ruis::dim::fill, ruis::dim::fill}
+                                        .dims{ruis::dim::min, ruis::dim::fill}
                                     },
                                     .widget_params{
                                         .id = "treeview_widget"s,
@@ -409,44 +414,47 @@ utki::shared_ref<ruis::window> make_tree_view_window(
 
     auto& treeview = w.get().get_widget_as<ruis::tree_view>("treeview_widget");
 
-    // TODO: remove
-    // auto provider = std::make_shared<tree_view_items_provider>(w.get().context);
-    // treeview.set_provider(provider);
-
     auto tv = utki::make_weak_from(treeview);
 
     auto& vertical_slider = w.get().get_widget_as<ruis::fraction_band_widget>("treeview_vertical_slider");
     auto vs = utki::make_weak_from(vertical_slider);
 
     vertical_slider.fraction_change_handler = [tv](ruis::fraction_widget& slider){
         if(auto t = tv.lock()){
-            t->set_vertical_scroll_factor(slider.get_fraction());
+            t->set_scroll_factor(slider.get_fraction());
         }
     };
 
+    auto& tvsa = w.get().get_widget_as<ruis::scroll_area>("tree_view_scroll_area"sv);
+
     auto& horizontal_slider = w.get().get_widget_as<ruis::fraction_band_widget>("treeview_horizontal_slider");
     auto hs = utki::make_weak_from(horizontal_slider);
 
-    horizontal_slider.fraction_change_handler = [tv](ruis::fraction_widget& slider){
-        if(auto t = tv.lock()){
-            t->set_horizontal_scroll_factor(slider.get_fraction());
+    horizontal_slider.fraction_change_handler = [tvsa = utki::make_weak_from(tvsa)](ruis::fraction_widget& slider){
+        if(auto sa = tvsa.lock()){
+            sa->set_scroll_factor({
+                slider.get_fraction(),
+                0
+            });
+        }
+    };
+
+    tvsa.scroll_change_handler = [hs = utki::make_weak_from(horizontal_slider)](ruis::scroll_area& sa){
+        if(auto h = hs.lock()){
+            h->set_band_fraction(sa.get_visible_area_fraction().x());
+            h->set_fraction(sa.get_scroll_factor().x(), false);
         }
     };
 
     treeview.scroll_change_handler = [
-            hs = utki::make_weak_from(horizontal_slider),
             vs = utki::make_weak_from(vertical_slider)
         ](ruis::tree_view& tw)
     {
         auto f = tw.get_scroll_factor();
         auto b = tw.get_scroll_band();
-        if(auto h = hs.lock()){
-            h->set_band_fraction(b.x());
-            h->set_fraction(f.x(), false);
-        }
         if(auto v = vs.lock()){
-            v->set_band_fraction(b.y());
-            v->set_fraction(f.y(), false);
+            v->set_band_fraction(b);
+            v->set_fraction(f, false);
         }
     };