The following commit has been merged in the master branch:
commit a6da6dd223d35f90f2bfd1cfcde37cba21bc638c
Author: Andrei Zavada <[email protected]>
Date: Tue Apr 23 00:59:53 2013 +0300
properly do afd290475
diff --git a/src/ui/mw/measurements_cb.cc b/src/ui/mw/measurements_cb.cc
index 7470f16..fc7be3d 100644
--- a/src/ui/mw/measurements_cb.cc
+++ b/src/ui/mw/measurements_cb.cc
@@ -127,7 +127,8 @@ daSubjectTimeline_scroll_event_cb(
auto& J = *(SExpDesignUI::SSubjectPresentation*)userdata;
auto& ED = J._p._p;
- if ( event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK) ) {
+ if ( event->state & GDK_CONTROL_MASK &&
+ event->state & GDK_SHIFT_MASK ) {
ED.modify_profile_scales( event->direction);
gtk_widget_queue_draw( (GtkWidget*)ED.cMeasurements);
return TRUE;
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
