fix tests

Author: igagis

tests/app/src/main.cpp

@@ -79,13 +79,13 @@ class application : public ruisapp::application{
 		auto c = make_root_widget(this->window.gui.context);
 		this->window.gui.set_root(c);
 
-		utki::dynamic_reference_cast<ruis::key_proxy>(c).get().key_handler = [this](ruis::key_proxy&, const ruis::key_event& e) -> bool {
-			if(e.is_down){
+		utki::dynamic_reference_cast<ruis::key_proxy>(c).get().key_handler = [this](ruis::key_proxy&, const ruis::key_event& e){
+			if(e.action == ruis::button_action::press){
 				if(e.combo.key == ruis::key::escape){
 					this->quit();
 				}
 			}
-			return false;
+			return ruis::event_status::propagate;
 		};
 
 //		ruis::ZipFile zf(fsif::FSFile::New("res.zip"), "test.gui.stob");
@@ -110,10 +110,10 @@ class application : public ruisapp::application{
 
 			auto& cp = c.get().get_widget_as<ruis::click_proxy>("cube_click_proxy");
 			auto& bg = c.get().get_widget_as<ruis::rectangle>("cube_bg_color");
-			cp.pressed_change_handler = [r{utki::make_shared_from(bg)}](ruis::click_proxy& w) -> bool {
+			cp.pressed_change_handler = [r{utki::make_shared_from(bg)}](ruis::click_proxy& w){
 				// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers)
 				r.get().set_color(w.is_pressed() ? 0xff808080 : 0x80808080);
-				return true;
+				return ruis::event_status::consumed;
 			};
 			cp.pressed_change_handler(cp); // set initial color
 			cp.click_handler = [cube = utki::make_shared_from(cube)](ruis::click_proxy&) -> bool {
@@ -200,9 +200,9 @@ class application : public ruisapp::application{
 			mouse_proxy->mouse_button_handler = [state, vl](ruis::mouse_proxy&, const ruis::mouse_button_event& e){
 				switch(e.button){
 					case ruis::mouse_button::left:
-						state->is_left_button_pressed = e.is_down;
+						state->is_left_button_pressed = (e.action == ruis::button_action::press);
 						state->old_pos = e.pos;
-						return true;
+						return ruis::event_status::consumed;
 					case ruis::mouse_button::wheel_down:
 						if(auto l = vl.lock()){
 							l->scroll_by(wheel_delta);
@@ -216,7 +216,7 @@ class application : public ruisapp::application{
 					default:
 						break;
 				}
-				return false;
+				return ruis::event_status::propagate;
 			};
 
 			mouse_proxy->mouse_move_handler = [vs, vl, state](ruis::mouse_proxy&, const ruis::mouse_move_event& e){
@@ -226,9 +226,9 @@ class application : public ruisapp::application{
 					if(auto l = vl.lock()){
 						l->scroll_by(dp.y());
 					}
-					return true;
+					return ruis::event_status::consumed;
 				}
-				return false;
+				return ruis::event_status::propagate;
 			};
 		}
 
@@ -268,20 +268,20 @@ class application : public ruisapp::application{
 				std::cout << "button = " << unsigned(e.button) << std::endl;
 				switch(e.button){
 					case ruis::mouse_button::left:
-						state->is_left_button_pressed = e.is_down;
+						state->is_left_button_pressed = (e.action == ruis::button_action::press);
 						state->old_pos = e.pos;
-						return true;
+						return ruis::event_status::consumed;
 					case ruis::mouse_button::wheel_left:
 						std::cout << "wheel_left" << std::endl;
-						if(e.is_down){
+						if(e.action == ruis::button_action::press){
 							if(auto l = hl.lock()){
 								l->scroll_by(-wheel_delta);
 							}
 						}
 						break;
 					case ruis::mouse_button::wheel_right:
 						std::cout << "wheel_right" << std::endl;
-						if(e.is_down){
+						if(e.action == ruis::button_action::press){
 							if(auto l = hl.lock()){
 								l->scroll_by(wheel_delta);
 							}
@@ -290,19 +290,19 @@ class application : public ruisapp::application{
 					default:
 						break;
 				}
-				return false;
+				return ruis::event_status::propagate;
 			};
 
-			mouse_proxy->mouse_move_handler = [hl, hs, state](ruis::mouse_proxy& w, const ruis::mouse_move_event& e) -> bool {
+			mouse_proxy->mouse_move_handler = [hl, hs, state](ruis::mouse_proxy& w, const ruis::mouse_move_event& e){
 				if(state->is_left_button_pressed){
 					auto dp = state->old_pos - e.pos;
 					state->old_pos = e.pos;
 					if(auto l = hl.lock()){
 						l->scroll_by(dp.x());
 					}
-					return true;
+					return ruis::event_status::consumed;
 				}
-				return false;
+				return ruis::event_status::propagate;
 			};
 		}