Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-07-27 06:45:53 +08:00
commit 57a3bd35a6
2 changed files with 11 additions and 0 deletions

View file

@ -106,6 +106,8 @@
<preference id="general.smoothScroll.scrollbars" name="general.smoothScroll.scrollbars" type="bool"/>
<preference id="general.smoothScroll.scrollbars.durationMinMS" name="general.smoothScroll.scrollbars.durationMinMS" type="int"/>
<preference id="general.smoothScroll.scrollbars.durationMaxMS" name="general.smoothScroll.scrollbars.durationMaxMS" type="int"/>
<preference id="mousewheel.default.delta_multiplier_y" name="mousewheel.default.delta_multiplier_y" type="int"/>
</preferences>
#ifdef HAVE_SHELL_SERVICE
@ -445,6 +447,13 @@
preference="general.smoothScroll.scrollbars.durationMaxMS"/>
<label flex="1">ms.</label>
</hbox>
<hbox align="center">
<label value="&smoothscroll.overall.yspeed.label;"/>
<textbox type="number" size="3" min="1" max="999"
preference="mousewheel.default.delta_multiplier_y"/>
<label flex="1">%.</label>
</hbox>
</groupbox>
</tabpanel>
<!-- end Smooth scrolling tab -->

View file

@ -147,3 +147,5 @@
<!ENTITY smoothscroll.pagekeys.duration "Page up/down scroll duration:">
<!ENTITY smoothscroll.scrollbar.label "Smooth scroll with scrollbars">
<!ENTITY smoothscroll.scrollbar.duration "Scrollbar smooth scroll duration:">
<!ENTITY smoothscroll.overall.yspeed.label "Overall smooth scroll speed:">