X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=dc8b12df2ad9a313e7dae4278a9b06a2b691d334;hb=eaf12afa6f6d98b64bec9dd9d55019e9bf3553a4;hp=313646fce09801f298674366f50898228ffe0526;hpb=8f87265e36fc726e20eef56be9647bc50b081f55;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index 313646f..dc8b12d 100644
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -72,6 +72,8 @@
 
 #include <synfig/mutex.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -1445,19 +1447,15 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 				if(get_selected_ducks().size()<=1)
 					duck->signal_user_click(2)();
 				else
-				{
 					canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MULTIPLE_DUCKS_CLICKED,BUTTON_RIGHT,mouse_pos,pressure,modifier));
-				}
 				return true;
 			}
-			else
-			if(bezier)
+			else if(bezier)
 			{
 				bezier->signal_user_click(2)(bezier_click_pos);
 				return true;
 			}
-			else
-			if(layer)
+			else if (layer)
 			{
 				if(canvas_view->get_smach().process_event(EventLayerClick(layer,BUTTON_RIGHT,mouse_pos))==Smach::RESULT_OK)
 					return false;
@@ -1546,11 +1544,13 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 
 			drawing_area->queue_draw();
 		}
+
 		if(dragging==DRAG_BOX)
 		{
 			curr_point=mouse_pos;
 			drawing_area->queue_draw();
 		}
+
 		if(dragging==DRAG_GUIDE)
 		{
 			if(curr_guide_is_x)
@@ -1559,30 +1559,34 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 				*curr_guide=mouse_pos[1];
 			drawing_area->queue_draw();
 		}
+
 		if(dragging!=DRAG_WINDOW)
 		{	// Update those triangle things on the rulers
 			const synfig::Point point(mouse_pos);
 			hruler->property_position()=Distance(point[0],Distance::SYSTEM_UNITS).get(App::distance_system,get_canvas()->rend_desc());
 			vruler->property_position()=Distance(point[1],Distance::SYSTEM_UNITS).get(App::distance_system,get_canvas()->rend_desc());
 		}
-		if(dragging==DRAG_WINDOW)
-		{
-			set_focus_point(get_focus_point()+mouse_pos-drag_point);
-		}
-		else
-		if(event->motion.state&GDK_BUTTON1_MASK && canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,BUTTON_LEFT,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+
+		if(dragging == DRAG_WINDOW)
+			set_focus_point(get_focus_point() + mouse_pos-drag_point);
+		else if (event->motion.state & GDK_BUTTON1_MASK &&
+				canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG, BUTTON_LEFT,
+																  mouse_pos,pressure,modifier)) == Smach::RESULT_ACCEPT)
 			return true;
-		else
-		if(event->motion.state&GDK_BUTTON2_MASK && canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,BUTTON_MIDDLE,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+		else if (event->motion.state & GDK_BUTTON2_MASK &&
+				 canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG, BUTTON_MIDDLE,
+																   mouse_pos, pressure, modifier)) == Smach::RESULT_ACCEPT)
 			return true;
-		else
-		if(event->motion.state&GDK_BUTTON3_MASK && canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,BUTTON_RIGHT,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+		else if (event->motion.state & GDK_BUTTON3_MASK &&
+				 canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG, BUTTON_RIGHT,
+																   mouse_pos, pressure, modifier)) == Smach::RESULT_ACCEPT)
 			return true;
-		else
-		if(canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_MOTION,BUTTON_NONE,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+		else if(canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_MOTION, BUTTON_NONE,
+																  mouse_pos, pressure,modifier)) == Smach::RESULT_ACCEPT)
 			return true;
 
 		break;
+
 	case GDK_BUTTON_RELEASE:
 	{
 		bool ret(false);