SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Qt 6 works on Windows host

Browse Source
This commit is contained in:
Пелипенко Иван
2022-01-23 12:59:57 +03:00
parent fcdc142991
commit bdb2acb414
14 changed files with 139 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libs/touch_widgets/touchslider.cpp
View File

@@ -141,7 +141,12 @@ void TouchSlider::updateCaption() {
void TouchSlider::on_barPos_mouseMoveEvent(QMouseEvent * e) {
if (m_readOnly) return;
int tx = e->x();
int tx =
#if QT_VERSION_MAJOR <= 5
e->x();
#else
e->position().toPoint().x();
#endif
if (tx > ui->barPos->width()) tx = ui->barPos->width();
if (tx < 0) {
if (hasZero) {
@@ -161,7 +166,12 @@ void TouchSlider::on_barPos_mouseMoveEvent(QMouseEvent * e) {
void TouchSlider::on_barNeg_mouseMoveEvent(QMouseEvent * e) {
if (m_readOnly) return;
int tx = e->x();
int tx =
#if QT_VERSION_MAJOR <= 5
e->x();
#else
e->position().toPoint().x();
#endif
if (tx < 0) tx = 0;
if (tx > ui->barNeg->width()) {
int nx = tx - ui->barPos->width() - layout()->spacing();
@@ -179,14 +189,26 @@ void TouchSlider::on_barNeg_mouseMoveEvent(QMouseEvent * e) {
void TouchSlider::on_barPos_mousePressEvent(QMouseEvent * e) {
if (m_readOnly) return;
ui->barPos->setValue(ui->barPos->minimum() + qRound((double)(e->x() * (ui->barPos->maximum() - ui->barPos->minimum())) / (double)(ui->barPos->width())));
int tx =
#if QT_VERSION_MAJOR <= 5
e->x();
#else
e->position().toPoint().x();
#endif
ui->barPos->setValue(ui->barPos->minimum() + qRound((double)(tx * (ui->barPos->maximum() - ui->barPos->minimum())) / (double)(ui->barPos->width())));
ui->barNeg->setValue(ui->barNeg->minimum());
}
void TouchSlider::on_barNeg_mousePressEvent(QMouseEvent * e) {
if (m_readOnly) return;
ui->barNeg->setValue(ui->barNeg->maximum() - qRound((double)(e->x()*ui->barNeg->maximum()) / (double)(ui->barNeg->width())));
int tx =
#if QT_VERSION_MAJOR <= 5
e->x();
#else
e->position().toPoint().x();
#endif
ui->barNeg->setValue(ui->barNeg->maximum() - qRound((double)(tx * ui->barNeg->maximum()) / (double)(ui->barNeg->width())));
ui->barPos->setValue(ui->barPos->minimum());
}