The following commit has been merged in the master branch:
commit e9e19394567dfc6bded3c0957b01760a1aab1b62
Author: Andrei Zavada <[email protected]>
Date: Wed Apr 24 19:12:38 2013 +0300
have general scroll speed factor
diff --git a/src/ui/mf/mf_cb.cc b/src/ui/mf/mf_cb.cc
index 194874f..801129d 100644
--- a/src/ui/mf/mf_cb.cc
+++ b/src/ui/mf/mf_cb.cc
@@ -124,10 +124,10 @@ daMFProfile_scroll_event_cb(
switch ( event->direction ) {
case GDK_SCROLL_DOWN:
- MF.display_factor /= 1.1;
+ MF.display_factor /= MF._p.scroll_factor;
break;
case GDK_SCROLL_UP:
- MF.display_factor *= 1.1;
+ MF.display_factor *= MF._p.scroll_factor;
break;
case GDK_SCROLL_LEFT:
break;
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index 39c441d..35b4399 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -123,6 +123,7 @@ const array<unsigned, 4>
const array<double, 3>
aghui::SExpDesignUI::FFTBinSizeValues = {{.1, .25, .5}};
+double aghui::SExpDesignUI::scroll_factor = 1.05;
using confval::SValidator;
@@ -199,6 +200,7 @@ SExpDesignUI (aghui::SSessionChooser *parent,
SValidator<double>("Profiles.PSD.FreqUpto",
&active_profile_psd_freq_upto, SValidator<double>::SVFRangeIn
(0., 20.)),
SValidator<double>("Profiles.SWU.F0",
&active_profile_swu_f0, SValidator<double>::SVFRangeIn
(0., 20.)),
SValidator<double>("Profiles.MC.F0",
&active_profile_mc_f0, SValidator<double>::SVFRangeIn
(0., 20.)),
+ SValidator<double>("Common.ScrollFactor",
&scroll_factor, SValidator<double>::SVFRangeIn
(1.001, 1.5)),
})
{
nodestroy_by_cb = true;
diff --git a/src/ui/mw/mw.hh b/src/ui/mw/mw.hh
index 5e951b0..84f1c02 100644
--- a/src/ui/mw/mw.hh
+++ b/src/ui/mw/mw.hh
@@ -300,6 +300,9 @@ class SExpDesignUI
sort_segregate;
void sort_subjects();
+ // general scrolling responsiveness
+ static double scroll_factor;
+
// _saved items
size_t tl_pph_saved,
tl_height_saved;
diff --git a/src/ui/sf/d/patterns_cb.cc b/src/ui/sf/d/patterns_cb.cc
index 723dec0..591bdf1 100644
--- a/src/ui/sf/d/patterns_cb.cc
+++ b/src/ui/sf/d/patterns_cb.cc
@@ -85,14 +85,14 @@ daSFFDThing_scroll_event_cb(
if ( event->state & GDK_SHIFT_MASK )
FD.set_thing_da_width( FD.da_thing_wd + 10);
else
- FD.thing_display_scale *= 1.05;
+ FD.thing_display_scale *= FD._p._p.scroll_factor;
break;
case GDK_SCROLL_DOWN:
if ( event->state & GDK_SHIFT_MASK ) {
if ( FD.da_thing_wd > 20 )
FD.set_thing_da_width( FD.da_thing_wd - 10);
} else
- FD.thing_display_scale /= 1.05;
+ FD.thing_display_scale /= FD._p._p.scroll_factor;
break;
default:
break;
@@ -197,14 +197,14 @@ daSFFDField_scroll_event_cb(
if ( event->state & GDK_SHIFT_MASK )
FD.set_field_da_width( FD.da_field_wd + 10);
else
- FD.field_display_scale *= 1.05;
+ FD.field_display_scale *= FD._p._p.scroll_factor;
break;
case GDK_SCROLL_DOWN:
if ( event->state & GDK_SHIFT_MASK ) {
if ( FD.da_field_wd > 20 )
FD.set_field_da_width( FD.da_field_wd - 10);
} else
- FD.field_display_scale /= 1.05;
+ FD.field_display_scale /= FD._p._p.scroll_factor;
break;
default:
break;
diff --git a/src/ui/sf/d/phasediff_cb.cc b/src/ui/sf/d/phasediff_cb.cc
index 9aea9ae..19bd1d1 100644
--- a/src/ui/sf/d/phasediff_cb.cc
+++ b/src/ui/sf/d/phasediff_cb.cc
@@ -47,10 +47,10 @@ daSFPD_scroll_event_cb(
switch ( event->direction ) {
case GDK_SCROLL_UP:
- PD.display_scale *= 1.05;
+ PD.display_scale *= PD._p._p.scroll_factor;
break;
case GDK_SCROLL_DOWN:
- PD.display_scale /= 1.05;
+ PD.display_scale /= PD._p._p.scroll_factor;
default:
break;
}
diff --git a/src/ui/sf/montage_cb.cc b/src/ui/sf/montage_cb.cc
index 6b3e7c4..e5109ce 100644
--- a/src/ui/sf/montage_cb.cc
+++ b/src/ui/sf/montage_cb.cc
@@ -342,7 +342,6 @@ daSFMontage_button_release_event_cb(
-#define smoothness 1.05
gboolean
daSFMontage_scroll_event_cb(
@@ -419,16 +418,16 @@ daSFMontage_scroll_event_cb(
} else {
switch ( event->direction ) {
case GDK_SCROLL_DOWN:
- Ch->psd.display_scale /= smoothness;
- Ch->swu.display_scale /= smoothness;
- Ch->mc.display_scale /= smoothness;
- Ch->emg_display_scale /= smoothness;
+ Ch->psd.display_scale /= SF._p.scroll_factor;
+ Ch->swu.display_scale /= SF._p.scroll_factor;
+ Ch->mc.display_scale /= SF._p.scroll_factor;
+ Ch->emg_display_scale /= SF._p.scroll_factor;
break;
case GDK_SCROLL_UP:
- Ch->psd.display_scale *= smoothness;
- Ch->swu.display_scale *= smoothness;
- Ch->mc.display_scale *= smoothness;
- Ch->emg_display_scale *= smoothness;
+ Ch->psd.display_scale *= SF._p.scroll_factor;
+ Ch->swu.display_scale *= SF._p.scroll_factor;
+ Ch->mc.display_scale *= SF._p.scroll_factor;
+ Ch->emg_display_scale *= SF._p.scroll_factor;
break;
case GDK_SCROLL_LEFT:
if ( SF.cur_vpage() > 0 )
@@ -456,10 +455,10 @@ daSFMontage_scroll_event_cb(
} else {
switch ( event->direction ) {
case GDK_SCROLL_DOWN:
- Ch->signal_display_scale /= smoothness;
+ Ch->signal_display_scale /= SF._p.scroll_factor;
break;
case GDK_SCROLL_UP:
- Ch->signal_display_scale *= smoothness;
+ Ch->signal_display_scale *= SF._p.scroll_factor;
break;
default:
break;
@@ -474,7 +473,6 @@ daSFMontage_scroll_event_cb(
return TRUE;
}
-#undef smoothness
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
