From 4fc13b9e1c51b20cca96e47800bbb98219f4b01f Mon Sep 17 00:00:00 2001 From: Hane Date: Thu, 16 May 2024 17:23:54 +0200 Subject: [PATCH] sliders value set to where clicked --- qtest.pro | 2 +- src/back/backlasses.cpp | 4 ++-- src/qt/qtclasses.cpp | 25 +++++++++++++++++++------ src/qt/qtclasses.h | 11 ++++++----- src/qtestmain.cpp | 4 +++- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/qtest.pro b/qtest.pro index 42b246a..97274fa 100644 --- a/qtest.pro +++ b/qtest.pro @@ -11,7 +11,7 @@ DESTPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" "$$PWD\src\back\reimpl" VPATH += "$$PWD\src" "$$PWD\src\qt" "$$PWD\src\back" "$$PWD\src\back\reimpl" "$$PWD\src\cont" SOURCES += qtestmain.cpp qtclasses.cpp backlasses.cpp backsessionclasses.cpp contclasses.cpp contsessionclasses.cpp -HEADERS += qtclasses.h backlasses.h backsessionclasses.h contclasses.h contsessionclasses.h global.h debug.h backfuncs.h ipolicyconfig.h msinclude.h +HEADERS += qtclasses.h backlasses.h backsessionclasses.h contclasses.h contsessionclasses.h global.h debug.h backfuncs.h ipolicyconfig.h msinclude.h qtvisuals.h RESOURCES = assets.qrc RC_ICONS += assets/logo.ico diff --git a/src/back/backlasses.cpp b/src/back/backlasses.cpp index 1f7b442..bfc0e83 100644 --- a/src/back/backlasses.cpp +++ b/src/back/backlasses.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "backlasses.h" +#include "backfuncs.h" EndpointNewSessionCallback::EndpointNewSessionCallback(EndpointHandler* eph){ this->eph = eph; diff --git a/src/qt/qtclasses.cpp b/src/qt/qtclasses.cpp index efac234..4dbfc59 100644 --- a/src/qt/qtclasses.cpp +++ b/src/qt/qtclasses.cpp @@ -6,6 +6,19 @@ CustomWidgetEvent::CustomWidgetEvent(QEvent::Type type, T payload) : QEvent(t this->payload = payload; } + +/* + * MeterSlider::MeterSlider(Qt::Orientation orientation, QWidget* parent) { + * //style = new MixerStyle(); + * //this->setStyle(style); + * } + */ + + +MeterSlider::~MeterSlider() { + delete style; +} + void MeterSlider::setPeakValue(float peakValue) { this->peakValue = peakValue; } @@ -99,7 +112,7 @@ void MeterSlider::paintEvent(QPaintEvent *event) { ((QWidget*)parent())->layout()->getContentsMargins(&left, &top, &right, &bottom); QStyle *style = QApplication::style(); - int lol = style->pixelMetric(QStyle::PM_SliderSpaceAvailable); + //int lol = style->pixelMetric(QStyle::PM_SliderSpaceAvailable); QPainter painter(this); //painter.setPen(Qt::blue); painter.setOpacity(1.0); @@ -125,8 +138,7 @@ void MeterSlider::paintEvent(QPaintEvent *event) { // - ((this->maximum() - this->value()) * stepWidth)) //double ratio = ; double handleShift = (double)((sliderSize.width() * ((double)(this->maximum() - this->value()) / 100))); - painter.fillRect((this->width() - ((this->maximum() - this->value()) * stepWidth)) - (sliderSize.width()) + handleShift, - top / 2, sliderSize.width(), sliderSize.height() - bottom, Qt::magenta); + painter.fillRect((this->width() - ((this->maximum() - this->value()) * stepWidth)) - (sliderSize.width()) + handleShift, top / 2, sliderSize.width(), sliderSize.height() - bottom, Qt::magenta); //sliderComplex.subControls = QStyle::SC_SliderHandle; //p.drawComplexControl(QStyle::CC_Slider, sliderComplex); } @@ -637,7 +649,7 @@ void EndpointWidget::addSessionWidget(CustomWidgetEvent* ev){ //TODO: change mainwindow's widget name and subclass qwidget const QWidgetList topLevelWidgets = QApplication::topLevelWidgets(); for (QWidget *widget : topLevelWidgets) { - if (dynamic_cast(widget)) { + if (qobject_cast(widget)) { double widthRatio = ((MainWindow*)widget)->widthRatio; sw->calculateSize(std::abs(this->screen()->geometry().width()) * widthRatio, std::abs(this->screen()->geometry().height())); @@ -917,8 +929,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); //scrollArea->verticalScrollBar()->setSingleStep(1); - - scrollArea->setStyleSheet("QScrollBar:vertical { width: 4px; }"); + + //custom style = no qss + //scrollArea->setStyleSheet("QScrollBar:vertical { width: 4px; }"); //scrollArea->setMinimumWidth(500); setCentralWidget(scrollArea); diff --git a/src/qt/qtclasses.h b/src/qt/qtclasses.h index c85b9ad..fd9f936 100644 --- a/src/qt/qtclasses.h +++ b/src/qt/qtclasses.h @@ -1,8 +1,5 @@ #pragma once -//#ifndef MAINWINDOW_H -//#define MAINWINDOW_H - #include #include #include @@ -47,6 +44,7 @@ #include "global.h" #include "contclasses.h" +#include "qtvisuals.h" enum SpawnPos { LEFT = (1 << 1), @@ -76,12 +74,17 @@ public: class MeterSlider : public QSlider { Q_OBJECT private: + ~MeterSlider(); float peakValue; + MixerStyle* style; + protected: bool event(QEvent* ev) override; void paintEvent(QPaintEvent *event) override; public: + //MeterSlider(Qt::Orientation orientation, QWidget *parent = nullptr); + //MeterSlider(QWidget* parent = nullptr) : MeterSlider(Qt::Vertical, parent){}; void setPeakValue(float peakValue); using QSlider::QSlider; }; @@ -278,5 +281,3 @@ private: //void valueChanged(int value); }; - -//#endif diff --git a/src/qtestmain.cpp b/src/qtestmain.cpp index 1d421cc..e4a6aec 100644 --- a/src/qtestmain.cpp +++ b/src/qtestmain.cpp @@ -46,13 +46,15 @@ void closeDebugFileLog() { */ int main (int argc, char* argv[]) { + /* * QStringList styles = QStyleFactory::keys(); * for(QString a : styles) { * log_debugcpp(a.toStdString()); * } */ - //QApplication::setStyle("Fusion"); + + QApplication::setStyle(new MixerStyle(QStyleFactory::create("windowsvista"))); //Check if running //https://stackoverflow.com/questions/48060989/qt-show-application-if-currently-running initialize_file_log();