From ca1d62372909f6310f437985cc7aab301c1b7165 Mon Sep 17 00:00:00 2001 From: Kezi Olio Date: Wed, 20 May 2020 00:09:52 +0200 Subject: [PATCH 1/2] Disable scrolling overshoot It was introduced in 51b90ecd73e37b9646d8a4bbb51e4fa815942912 together with kinetic scrolling, but people do not like it. BUGS: 421482 --- ui/pageview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/pageview.cpp b/ui/pageview.cpp index 938aa5039..1d5782c6f 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -448,8 +448,8 @@ PageView::PageView( QWidget *parent, Okular::Document *document ) QScrollerProperties prop; prop.setScrollMetric(QScrollerProperties::DecelerationFactor, 0.3); prop.setScrollMetric(QScrollerProperties::MaximumVelocity, 1); - prop.setScrollMetric(QScrollerProperties::OvershootScrollDistanceFactor, 0.05); - prop.setScrollMetric(QScrollerProperties::OvershootDragDistanceFactor, 0.05); + prop.setScrollMetric(QScrollerProperties::HorizontalOvershootPolicy, QScrollerProperties::OvershootAlwaysOff); + prop.setScrollMetric(QScrollerProperties::VerticalOvershootPolicy, QScrollerProperties::OvershootAlwaysOff); d->scroller->setScrollerProperties(prop); connect(d->scroller, &QScroller::stateChanged, this, &PageView::slotRequestVisiblePixmaps); From a0d6a377cb0cc1704c1a9f93b626a6e6dc136907 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sat, 23 May 2020 20:07:30 +0200 Subject: [PATCH 2/2] CI: Remove python-yaml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 492b54b70..16004286c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,7 @@ build_clazy_clang_tidy: - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list - apt-get update - apt-get build-dep --yes --no-install-recommends okular - - apt-get install --yes --no-install-recommends ninja-build clazy clang clang-tidy python python-yaml libkf5crash-dev libkf5purpose-dev libegl-dev jq + - apt-get install --yes --no-install-recommends ninja-build clazy clang clang-tidy python libkf5crash-dev libkf5purpose-dev libegl-dev jq script: - srcdir=`pwd` && mkdir -p /tmp/okular_build && cd /tmp/okular_build && CC=clang CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -G Ninja $srcdir && cat compile_commands.json | jq '[.[] | select(.file | contains("'"$srcdir"'"))]' > compile_commands.aux.json && cat compile_commands.aux.json | jq '[.[] | select(.file | contains("/synctex/")| not)]' > compile_commands.json && cp "$srcdir/.clang-tidy" .