stuff

Author: igagis

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

@@ -50,8 +50,8 @@ ruis::event_status flickable::on_mouse_button(const mouse_button_event& event)
 				utki::assert(event.action == button_action::press, SL);
 
 				this->push_touch_move_to_history({.position = event.pos, .timestamp_ms = utki::get_ticks_ms()});
-				auto vel = this->calculate_touch_velocity();
-				std::cout << "touch press, vel = " << vel << std::endl;
+
+				// std::cout << "touch press, vel = " << this->calculate_touch_velocity() << std::endl;
 
 				this->cur_state = state::within_scroll_threshold;
 				this->prev_touch_point = event.pos;
@@ -69,14 +69,13 @@ ruis::event_status flickable::on_mouse_button(const mouse_button_event& event)
 				utki::assert(event.action == button_action::release, SL);
 				this->cur_state = state::idle;
 
-				auto vel = this->calculate_touch_velocity();
-				std::cout << "touch release, vel = " << vel << std::endl;
+				// std::cout << "touch release, vel = " << this->calculate_touch_velocity() << std::endl;
 
 				this->touch_history.clear();
 
 				return this->flickable_on_mouse_button(event);
 			}
-		case state::scrolling:
+		case state::dragging:
 			{
 				utki::assert(event.action == button_action::release, SL);
 				this->cur_state = state::idle;
@@ -107,8 +106,7 @@ ruis::event_status flickable::on_mouse_move(const mouse_move_event& event)
 
 	this->push_touch_move_to_history({.position = event.pos, .timestamp_ms = utki::get_ticks_ms()});
 
-	auto vel = this->calculate_touch_velocity();
-	std::cout << "touch move, vel = " << vel << std::endl;
+	// std::cout << "touch move, vel = " << this->calculate_touch_velocity() << std::endl;
 
 	switch (this->cur_state) {
 		default:
@@ -132,29 +130,36 @@ ruis::event_status flickable::on_mouse_move(const mouse_move_event& event)
 				// std::cout << "mouse move: within scroll threshold, delta: " << delta << ", abs_delta: " << abs_delta << "\n";
 
 				if (abs_delta.x() > this->scroll_threshold_px || abs_delta.y() > this->scroll_threshold_px) {
-					this->cur_state = state::scrolling;
+					this->cur_state = state::dragging;
 
 					// std::cout << "scrolling\n";
 
 					this->prev_touch_point = event.pos;
 
 					// send mouse button up event out of widget area to cancel any ongoing interactions
 					{
-						ruis::mouse_button_event mbe{
-							button_action::release,
-							[]() {
-								using std::numeric_limits;
-
-								if constexpr (numeric_limits<ruis::real>::has_infinity) {
-									return -numeric_limits<ruis::real>::infinity();
-								} else {
-									return numeric_limits<ruis::real>::min();
-								}
-							}(),
-							mouse_button::left,
-							this->cur_pointer_id
-						};
-						this->flickable_on_mouse_button(mbe);
+						auto pos = []() {
+							using std::numeric_limits;
+
+							if constexpr (numeric_limits<ruis::real>::has_infinity) {
+								return -numeric_limits<ruis::real>::infinity();
+							} else {
+								return numeric_limits<ruis::real>::min();
+							}
+						}();
+
+						// 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_scroll_by(-delta);
@@ -164,7 +169,7 @@ ruis::event_status flickable::on_mouse_move(const mouse_move_event& event)
 		case state::not_scrolling:
 			// std::cout << "mouse move: not scrolling\n";
 			return this->flickable_on_mouse_move(event);
-		case state::scrolling:
+		case state::dragging:
 			{
 				vec2 delta = event.pos - this->prev_touch_point;
 				// std::cout << "mouse move: scrolling, delta: " << delta << "\n";

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

@@ -41,7 +41,8 @@ class flickable :
 		idle,
 		within_scroll_threshold,
 		not_scrolling,
-		scrolling
+		dragging,
+		inertial_scrolling
 	} cur_state = state::idle;
 
 	vec2 prev_touch_point;
@@ -62,6 +63,8 @@ class flickable :
 
 	ruis::vec2 calculate_touch_velocity_for_at_least_3_points_using_ols_method();
 
+
+
 public:
 	event_status on_mouse_button(const mouse_button_event& event) override;
 	event_status on_mouse_move(const mouse_move_event& event) override;

src/ruis/widget/button/push_button.cpp

@@ -55,7 +55,10 @@ event_status push_button::on_mouse_button(const mouse_button_event& e)
 	} else {
 		if (this->is_pressed()) {
 			if (this->pointer_id == e.pointer_id) {
-				// check that released the same pointer which has pressed the button before
+				// released the same pointer which has pressed the button before
+
+				std::cout << "push_button: released" << std::endl;
+
 				this->set_pressed(false);
 			}
 		}
@@ -66,7 +69,7 @@ event_status push_button::on_mouse_button(const mouse_button_event& e)
 
 void push_button::on_hovered_change(unsigned pointer_id)
 {
-	//	TRACE(<< "push_button::on_hover_change(): enter" << std::endl)
+	std::cout << "push_button::on_hover_change(): this->is_hovered(" << pointer_id << ") = " << this->is_hovered(pointer_id) << std::endl;
 
 	if (!this->is_hovered(pointer_id)) {
 		if (this->is_pressed() && this->pointer_id == pointer_id) {

src/ruis/widget/container.cpp

@@ -262,7 +262,10 @@ void container::on_hovered_change(unsigned pointer_id)
 		return;
 	}
 
-	// un-hover all the children since container became un-hovered
+	// the container has just became unhovered
+	utki::assert([&](){return !this->is_hovered(pointer_id);}, SL);
+
+	// unhover all the children
 	blocked_flag_guard blocked_guard(this->is_blocked);
 	for (auto& w : this->children()) {
 		w.get().set_hovered(false, pointer_id);

src/ruis/widget/group/scroll_area.cpp

@@ -83,9 +83,8 @@ void scroll_area::clamp_scroll_pos()
 
 	utki::assert(this->invisible_dims.is_positive_or_zero(), SL);
 
-	std::cout << "scroll_area::clamp_scroll_pos(): invisible_dims: " << this->invisible_dims << "\n";
-	std::cout << "scroll_area::clamp_scroll_pos(): before clamping this->cur_scroll_pos: " << this->cur_scroll_pos
-			  << "\n";
+	// std::cout << "scroll_area::clamp_scroll_pos(): invisible_dims: " << this->invisible_dims << "\n";
+	// std::cout << "scroll_area::clamp_scroll_pos(): before clamping this->cur_scroll_pos: " << this->cur_scroll_pos << "\n";
 
 	this->cur_scroll_pos =
 		max(real(0), //
@@ -97,13 +96,13 @@ void scroll_area::set_scroll_pos(const vec2& new_scroll_pos)
 {
 	using std::round;
 
-	std::cout << "sceoll_area::set_scroll_pos(): this->cur_scroll_pos: " << this->cur_scroll_pos << "\n";
+	// std::cout << "sceoll_area::set_scroll_pos(): this->cur_scroll_pos: " << this->cur_scroll_pos << "\n";
 
 	this->cur_scroll_pos = round(new_scroll_pos);
 
 	this->clamp_scroll_pos();
 
-	std::cout << "sceoll_area::set_scroll_pos(): after clamping this->cur_scroll_pos: " << this->cur_scroll_pos << "\n";
+	// std::cout << "sceoll_area::set_scroll_pos(): after clamping this->cur_scroll_pos: " << this->cur_scroll_pos << "\n";
 
 	this->update_scroll_factor();
 

src/ruis/widget/widget.cpp

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