fix build

Author: igagis

src/ruis/widget/base/touch/flickable.cpp

@@ -26,6 +26,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 using namespace ruis::touch;
 
+flickable::flickable(utki::shared_ref<ruis::context> context) :
+	friction(context.get().units.dots_per_pp() * 0.005)
+{}
+
 ruis::event_status flickable::on_mouse_button(const mouse_button_event& event)
 {
 	if (event.button != mouse_button::left) {
@@ -161,17 +165,14 @@ ruis::event_status flickable::on_mouse_move(const mouse_move_event& event)
 						}();
 
 						// move the cursor out of any widget to update hovered states
-						this->flickable_on_mouse_move({
-							.pos = pos,
-							.pointer_id = this->cur_pointer_id
-						});
-
-						this->flickable_on_mouse_button({
-							.action = button_action::release,
-							.pos = pos,
-							.button = mouse_button::left,
-							.pointer_id = this->cur_pointer_id
-						});
+						this->flickable_on_mouse_move({.pos = pos, .pointer_id = this->cur_pointer_id});
+
+						this->flickable_on_mouse_button(
+							{.action = button_action::release,
+							 .pos = pos,
+							 .button = mouse_button::left,
+							 .pointer_id = this->cur_pointer_id}
+						);
 					}
 
 					this->flickable_scroll_by(-delta);
@@ -199,7 +200,9 @@ void flickable::update(uint32_t dt_ms)
 	auto scrolled_by = this->flickable_scroll_by(-this->velocity_px_per_ms * ruis::real(dt_ms));
 
 	using std::copysign;
-	auto velocity_sign = this->velocity_px_per_ms.comp_op([](const auto& e){return copysign(real(1), e);});
+	auto velocity_sign = this->velocity_px_per_ms.comp_op([](const auto& e) {
+		return copysign(real(1), e);
+	});
 
 	auto prev_velocity_px_per_ms = this->velocity_px_per_ms;
 
@@ -210,14 +213,16 @@ void flickable::update(uint32_t dt_ms)
 
 	// std::cout << "this->velocity_px_per_ms = " << this->velocity_px_per_ms << std::endl;
 
-	for(auto [prev, cur, scrolled_px] : utki::views::zip(prev_velocity_px_per_ms, this->velocity_px_per_ms, scrolled_by)){
+	for (auto [prev, cur, scrolled_px] :
+		 utki::views::zip(prev_velocity_px_per_ms, this->velocity_px_per_ms, scrolled_by))
+	{
 		using std::signbit;
-		if(signbit(prev) != signbit(cur) || scrolled_px == 0){
+		if (signbit(prev) != signbit(cur) || scrolled_px == 0) {
 			cur = ruis::real(0);
 		}
 	}
 
-	if(this->velocity_px_per_ms.is_zero()){
+	if (this->velocity_px_per_ms.is_zero()) {
 		this->context.get().updater.get().stop(*this);
 		this->cur_state = state::idle;
 	}

src/ruis/widget/base/touch/flickable.hpp

@@ -63,14 +63,16 @@ class flickable :
 	ruis::vec2 calculate_touch_velocity_for_at_least_3_points_using_ols_method_px_per_ms();
 
 	// inertial scrolling state
-	ruis::real friction = this->context.get().units.dots_per_pp() * 0.005; // TODO: update if dots per pp changes
+	ruis::real friction; // TODO: update if dots per pp changes
 	ruis::vec2 velocity_px_per_ms;
 
 public:
 	event_status on_mouse_button(const mouse_button_event& event) override;
 	event_status on_mouse_move(const mouse_move_event& event) override;
 
 protected:
+	flickable(utki::shared_ref<ruis::context> context);
+
 	// TODO: doxygen
 	virtual event_status flickable_on_mouse_button(const mouse_button_event& event) = 0;
 	virtual event_status flickable_on_mouse_move(const mouse_move_event& event) = 0;

src/ruis/widget/button/push_button.cpp

@@ -57,7 +57,7 @@ event_status push_button::on_mouse_button(const mouse_button_event& e)
 			if (this->pointer_id == e.pointer_id) {
 				// released the same pointer which has pressed the button before
 
-				std::cout << "push_button: released" << std::endl;
+				// std::cout << "push_button: released" << std::endl;
 
 				this->set_pressed(false);
 			}

src/ruis/widget/container.cpp

@@ -263,7 +263,12 @@ void container::on_hovered_change(unsigned pointer_id)
 	}
 
 	// the container has just became unhovered
-	utki::assert([&](){return !this->is_hovered(pointer_id);}, SL);
+	utki::assert(
+		[&]() {
+			return !this->is_hovered(pointer_id);
+		},
+		SL
+	);
 
 	// unhover all the children
 	blocked_flag_guard blocked_guard(this->is_blocked);

src/ruis/widget/group/touch/scroll_area.cpp

@@ -38,8 +38,9 @@ scroll_area::scroll_area(
 		this->context,
 		{},
 		std::move(children)
-	)
-// clang-format on
+	),
+	// clang-format on
+	flickable(this->context)
 {}
 
 ruis::event_status scroll_area::on_mouse_button(const mouse_button_event& event)

src/ruis/widget/widget.cpp

@@ -442,10 +442,20 @@ void widget::set_hovered(bool is_hovered, unsigned pointer_id)
 	//	TRACE(<< "widget::setHovered(): isHovered = " << isHovered << " this->name() = " << this->name() << std::endl)
 
 	if (is_hovered) {
-		utki::assert([&](){return !this->is_hovered(pointer_id);}, SL);
+		utki::assert(
+			[&]() {
+				return !this->is_hovered(pointer_id);
+			},
+			SL
+		);
 		this->hovered.insert(pointer_id);
 	} else {
-		utki::assert([&](){return this->is_hovered(pointer_id);}, SL);
+		utki::assert(
+			[&]() {
+				return this->is_hovered(pointer_id);
+			},
+			SL
+		);
 		this->hovered.erase(pointer_id);
 	}