testing some settings

pull/20392/head
Comma Device 4 years ago
parent f967be8f71
commit cd0fed5b16
  1. 15
      selfdrive/ui/qt/offroad/onboarding.cc
  2. 2
      selfdrive/ui/qt/offroad/onboarding.hpp

@ -12,6 +12,8 @@
#include "home.hpp" #include "home.hpp"
#include "util.h" #include "util.h"
#include <QEasingCurve>
void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) { void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) {
int leftOffset = (geometry().width()-1620)/2; int leftOffset = (geometry().width()-1620)/2;
@ -85,11 +87,17 @@ QWidget* OnboardingWindow::terms_screen() {
// TODO: tune the scrolling // TODO: tune the scrolling
auto sb = terms_text->verticalScrollBar();
QScrollerProperties sp; QScrollerProperties sp;
/*
sp.setScrollMetric(QScrollerProperties::DragStartDistance, 0.001); sp.setScrollMetric(QScrollerProperties::DragStartDistance, 0.001);
sp.setScrollMetric(QScrollerProperties::DragVelocitySmoothingFactor, 0.5);
sp.setScrollMetric( QScrollerProperties::ScrollingCurve, QEasingCurve::Linear );
sp.setScrollMetric(QScrollerProperties::DecelerationFactor, 0.4);
*/
scroller = QScroller::scroller(terms_text);
scroller->setScrollerProperties(sp);
auto sb = terms_text->verticalScrollBar();
#ifdef QCOM2 #ifdef QCOM2
sb->setStyleSheet(R"( sb->setStyleSheet(R"(
QScrollBar { QScrollBar {
@ -105,7 +113,8 @@ QWidget* OnboardingWindow::terms_screen() {
} }
)"); )");
#else #else
QScroller::grabGesture(terms_text, QScroller::TouchGesture); //QScroller::grabGesture(terms_text, QScroller::TouchGesture);
scroller->grabGesture(terms_text, QScroller::TouchGesture);
terms_text->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); terms_text->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
#endif #endif

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <QWidget> #include <QWidget>
#include <QScroller>
#include <QStackedWidget> #include <QStackedWidget>
#include <QStackedLayout> #include <QStackedLayout>
#include <QTextEdit> #include <QTextEdit>
@ -40,6 +41,7 @@ private:
QTextEdit *terms_text; QTextEdit *terms_text;
QWidget *terms_screen(); QWidget *terms_screen();
QWidget *training_screen(); QWidget *training_screen();
QScroller *scroller;
signals: signals:
void onboardingDone(); void onboardingDone();

Loading…
Cancel
Save