mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'qPCR4vir-hotfix-1.3' into hotfix-1.3

Browse Source
This commit is contained in:
Jinhao 2016-04-21 22:08:05 +08:00
commit 40c47db71b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -56,7 +56,7 @@ matrix:
- llvm-toolchain-precise - llvm-toolchain-precise
before_install: before_install:
- git clone --depth=1 --branch=dev_nana_in_examples https://github.com/qPCR4vir/nana-demo.git nana-demo - git clone --depth=1 --branch=hotfix-1.3 https://github.com/qPCR4vir/nana-demo.git nana-demo
- export PATH="$HOME/bin:$PATH" - export PATH="$HOME/bin:$PATH"
- mkdir ~/bin - mkdir ~/bin
- wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.4/cmake-3.4.0-rc3-Linux-x86_64.sh || true - wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.4/cmake-3.4.0-rc3-Linux-x86_64.sh || true

4
source/gui/widgets/listbox.cpp
View File

@ -2289,9 +2289,9 @@ namespace nana
index_pair target; index_pair target;
if(upwards == false) if(upwards == false)
lister.forward(scroll.offset_y_dpl, 1, target); lister.forward(scroll.offset_y_dpl, 3, target); // scheme ??
else else
lister.backward(scroll.offset_y_dpl, 1, target); lister.backward(scroll.offset_y_dpl, 3, target);
if (target == scroll.offset_y_dpl) if (target == scroll.offset_y_dpl)
return false; return false;