2008-12-21 Jim Evins <evins@snaught.com>

	* src/view.c: (motion_notify_event_cb), (button_press_event_cb):
		Don't check for handles on aggregate selections.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@808 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 05f6c6c89d5c21f5278a9c4858008e6943364776..f517baff06f47e87f3779953ea628c9893c6b4e7 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-21  Jim Evins  <evins@snaught.com>
+
+       * src/view.c: (motion_notify_event_cb), (button_press_event_cb):
+               Don't check for handles on aggregate selections.
+
 2008-12-18  Jim Evins  <evins@snaught.com>
 
        * src/view.c: (selection_received_cb):

diff --git a/glabels2/src/view.c b/glabels2/src/view.c
index e59623941889b84b26baaec84c9488d7081436f3..eb3bfc673cf26e53e4875aea88f58f09a2e76fa2 100644 (file)
--- a/glabels2/src/view.c
+++ b/glabels2/src/view.c
@@ -3220,7 +3220,8 @@ motion_notify_event_cb (glView            *view,
                 {
 
                 case GL_VIEW_IDLE:
-                        if (view_handle_at (view, cr, event->x, event->y, &handle))
+                        if ( gl_view_is_selection_atomic (view) &&
+                             view_handle_at (view, cr, event->x, event->y, &handle) )
                         {
                                 cursor = gdk_cursor_new (GDK_CROSSHAIR);
                         }
@@ -3365,7 +3366,8 @@ button_press_event_cb (glView            *view,
                 switch (view->mode)
                 {
                 case GL_VIEW_MODE_ARROW:
-                        if ((view_object = view_handle_at (view, cr, event->x, event->y, &handle)))
+                        if ( gl_view_is_selection_atomic (view) &&
+                             (view_object = view_handle_at (view, cr, event->x, event->y, &handle)) )
                         {
                                 view->resize_object = view_object;
                                 view->resize_handle = handle;