diff --git a/BionxControl.vcxproj b/BionxControl.vcxproj index d125747..da67f66 100644 --- a/BionxControl.vcxproj +++ b/BionxControl.vcxproj @@ -83,7 +83,8 @@ MaxSpeed _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions) false - + + MultiThreadedDLL true true @@ -212,13 +213,11 @@ - - diff --git a/BionxControl.vcxproj.filters b/BionxControl.vcxproj.filters index 5ea9198..4486f02 100644 --- a/BionxControl.vcxproj.filters +++ b/BionxControl.vcxproj.filters @@ -89,9 +89,6 @@ Source Files - - Source Files - Source Files @@ -103,9 +100,6 @@ - - Header Files - Header Files diff --git a/bcvaluedelegate.cpp b/bcvaluedelegate.cpp index c02a3c1..9abf480 100644 --- a/bcvaluedelegate.cpp +++ b/bcvaluedelegate.cpp @@ -45,7 +45,7 @@ #include #include #include -#include + BCValueDelegate::BCValueDelegate(const BCValueList& valueList, BCDeviceView* view) : QStyledItemDelegate{view}, _valueList{valueList}, _view{view} diff --git a/bcvalueslider.cpp b/bcvalueslider.cpp index c3315c6..cec66ba 100644 --- a/bcvalueslider.cpp +++ b/bcvalueslider.cpp @@ -32,7 +32,6 @@ #include -#include #include @@ -42,7 +41,8 @@ BCValueSlider::BCValueSlider( QWidget *parent ) setupUi(this); // wir wollen ja modern sein - _slider->setStyle(new BCValueSliderStyle()); + _sliderStyle = std::make_unique(); + _slider->setStyle(_sliderStyle.get()); setAutoFillBackground(true); QSizePolicy sp = _commitButton->sizePolicy(); diff --git a/bcvalueslider.h b/bcvalueslider.h index d9a9a79..2add1ca 100644 --- a/bcvalueslider.h +++ b/bcvalueslider.h @@ -59,6 +59,7 @@ protected: static constexpr int cPaddingRight = 8; static constexpr int cSliderWidth = 117; + std::unique_ptr _sliderStyle; }; #endif // BC_VALUESLIDER_H diff --git a/bcvaluesliderstyle.h b/bcvaluesliderstyle.h deleted file mode 100644 index 968fa0a..0000000 --- a/bcvaluesliderstyle.h +++ /dev/null @@ -1,65 +0,0 @@ -/*************************************************************************** - - BionxControl - © 2025 -2026 christoph holzheuer - christoph.holzheuer@gmail.com - - Using: - - mhs_can_drv.c - © 2011 - 2023 by MHS-Elektronik GmbH & Co. KG, Germany - Klaus Demlehner, klaus@mhs-elektronik.de - @see www.mhs-elektronik.de - - Based on Bionx data type descriptions from: - - BigXionFlasher USB V 0.2.4 rev. 97 - © 2011-2013 by Thomas Koenig - @see www.bigxionflasher.org - - Bionx Bike Info - © 2018 Thorsten Schmidt (tschmidt@ts-soft.de) - @see www.ts-soft.de - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - @see https://github.com/bikemike/bionx-bikeinfo - - ***************************************************************************/ - - -#ifndef BC_VALUESLIDERSTYLE_H -#define BC_VALUESLIDERSTYLE_H - -#include -#include -#include -#include - - -// Fluent Design Slider Style -class BCValueSliderStyle : public QProxyStyle -{ - -public: - - BCValueSliderStyle(); - - int pixelMetric(PixelMetric metric, const QStyleOption* option = nullptr, const QWidget* widget = nullptr) const override; - - QRect subControlRect(ComplexControl cc, const QStyleOptionComplex* opt, SubControl sc, const QWidget* widget) const override; - void drawComplexControl(ComplexControl control, const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget) const override; - void drawHorizontalFluentSlider(QPainter* painter, - const QStyleOptionSlider* slider, - const QColor& activeColor, - const QColor& bgColor) const; - - static void paintSliderIndicator(QPainter* painter, const QRect& rect, double ratio ); - static void paintSliderIndicator2(QPainter* painter, const QRect& rect, double ratio ); - -}; - - -#endif // BC_VALUESLIDERSTYLE_H