some switch using enum

Author: igagis

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

@@ -128,10 +128,12 @@ ruis::event_status flickable::on_mouse_move(const mouse_move_event& event)
 	// std::cout << "touch move, vel = " << this->calculate_touch_velocity() << std::endl;
 
 	switch (this->cur_state) {
-		case state::inertial_scrolling:
+		using enum state;
+
+		case inertial_scrolling:
 			// check for inertial_scrolling is done before the switch()
 			[[fallthrough]];
-		case state::idle:
+		case idle:
 			// check for idle is done before the switch()
 			[[fallthrough]];
 		default:
@@ -143,7 +145,7 @@ ruis::event_status flickable::on_mouse_move(const mouse_move_event& event)
 				SL
 			);
 			return ruis::event_status::propagate;
-		case state::within_scroll_threshold:
+		case within_scroll_threshold:
 			{
 				if (this->flickable_on_mouse_move(event) == event_status::consumed) {
 					this->cur_state = state::not_scrolling;
@@ -190,10 +192,10 @@ ruis::event_status flickable::on_mouse_move(const mouse_move_event& event)
 				}
 			}
 			return event_status::consumed;
-		case state::not_scrolling:
+		case not_scrolling:
 			// std::cout << "mouse move: not scrolling\n";
 			return this->flickable_on_mouse_move(event);
-		case state::dragging:
+		case dragging:
 			{
 				vec2 delta = event.pos - this->prev_touch_point;
 				// std::cout << "mouse move: scrolling, delta: " << delta << "\n";

tests/app/src/main.cpp

@@ -212,16 +212,18 @@ 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:
+					using enum ruis::mouse_button;
+
+					case left:
 						state->is_left_button_pressed = (e.action == ruis::button_action::press);
 						state->old_pos = e.pos;
 						return ruis::event_status::consumed;
-					case ruis::mouse_button::wheel_down:
+					case wheel_down:
 						if(auto l = vl.lock()){
 							l->scroll_by(wheel_delta);
 						}
 						break;
-					case ruis::mouse_button::wheel_up:
+					case wheel_up:
 						if(auto l = vl.lock()){
 							l->scroll_by(-wheel_delta);
 						}
@@ -290,19 +292,21 @@ class application : public ruisapp::application{
 			) -> ruis::event_status {
 				std::cout << "button = " << unsigned(e.button) << std::endl;
 				switch(e.button){
-					case ruis::mouse_button::left:
+					using enum ruis::mouse_button;
+
+					case left:
 						state->is_left_button_pressed = (e.action == ruis::button_action::press);
 						state->old_pos = e.pos;
 						return ruis::event_status::consumed;
-					case ruis::mouse_button::wheel_left:
+					case wheel_left:
 						std::cout << "wheel_left" << std::endl;
 						if(e.action == ruis::button_action::press){
 							if(auto l = hl.lock()){
 								l->scroll_by(-wheel_delta);
 							}
 						}
 						break;
-					case ruis::mouse_button::wheel_right:
+					case wheel_right:
 						std::cout << "wheel_right" << std::endl;
 						if(e.action == ruis::button_action::press){
 							if(auto l = hl.lock()){

tests/wire_area/src/wire_socket.cpp

@@ -49,21 +49,21 @@ std::array<ruis::vec2, 2> wire_socket::outlet_pos() const noexcept{
 	ruis::vec2 dir;
 	ruis::vec2 pos;
 	switch(this->params.outlet_orientation){
-		default:
-			ASSERT(false)
-		case orientation::bottom:
+		using enum orientation;
+
+		case bottom:
 			pos = this->rect().p + this->rect().d.comp_mul(ruis::vec2(0.5, 1));
 			dir = ruis::vec2(0, 1);
 			break;
-		case orientation::left:
+		case left:
 			pos = this->rect().p + this->rect().d.comp_mul(ruis::vec2(0, 0.5));
 			dir = ruis::vec2(-1, 0);
 			break;
-		case orientation::right:
+		case right:
 			pos = this->rect().p + this->rect().d.comp_mul(ruis::vec2(1, 0.5));
 			dir = ruis::vec2(1, 0);
 			break;
-		case orientation::top:
+		case top:
 			pos = this->rect().p + this->rect().d.comp_mul(ruis::vec2(0.5, 0));
 			dir = ruis::vec2(0, -1);
 			break;