From ea6292168a6acd4c263913f0ccd7dd64daf4f5cf Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 23 Feb 2018 01:45:58 +0100 Subject: Revert "Applied clang-format on source" This reverts commit 5e5c9c07291f6b09623d31c92b1fb61c4ede576e. --- src/viewmarkingscrollbar.cpp | 54 ++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 25 deletions(-) (limited to 'src/viewmarkingscrollbar.cpp') diff --git a/src/viewmarkingscrollbar.cpp b/src/viewmarkingscrollbar.cpp index 596af533..2452d0e3 100644 --- a/src/viewmarkingscrollbar.cpp +++ b/src/viewmarkingscrollbar.cpp @@ -1,38 +1,42 @@ #include "viewmarkingscrollbar.h" -#include #include #include +#include -ViewMarkingScrollBar::ViewMarkingScrollBar(QAbstractItemModel* model, QWidget* parent, int role) - : QScrollBar(parent), m_Model(model), m_Role(role) { - // not implemented for horizontal sliders - Q_ASSERT(this->orientation() == Qt::Vertical); +ViewMarkingScrollBar::ViewMarkingScrollBar(QAbstractItemModel *model, QWidget *parent, int role) + : QScrollBar(parent) + , m_Model(model) + , m_Role(role) +{ + // not implemented for horizontal sliders + Q_ASSERT(this->orientation() == Qt::Vertical); } -void ViewMarkingScrollBar::paintEvent(QPaintEvent* event) { - if (m_Model == nullptr) { - return; - } - QScrollBar::paintEvent(event); +void ViewMarkingScrollBar::paintEvent(QPaintEvent *event) +{ + if (m_Model == nullptr) { + return; + } + QScrollBar::paintEvent(event); - QStyleOptionSlider styleOption; - initStyleOption(&styleOption); + QStyleOptionSlider styleOption; + initStyleOption(&styleOption); - QPainter painter(this); + QPainter painter(this); - QRect handleRect = style()->subControlRect(QStyle::CC_ScrollBar, &styleOption, QStyle::SC_ScrollBarSlider, this); - QRect innerRect = style()->subControlRect(QStyle::CC_ScrollBar, &styleOption, QStyle::SC_ScrollBarGroove, this); + QRect handleRect = style()->subControlRect(QStyle::CC_ScrollBar, &styleOption, QStyle::SC_ScrollBarSlider, this); + QRect innerRect = style()->subControlRect(QStyle::CC_ScrollBar, &styleOption, QStyle::SC_ScrollBarGroove, this); - painter.translate(innerRect.topLeft() + QPoint(0, 3)); - qreal scale = static_cast(innerRect.height() - 3) / static_cast(m_Model->rowCount()); + painter.translate(innerRect.topLeft() + QPoint(0, 3)); + qreal scale = static_cast(innerRect.height() - 3) / static_cast(m_Model->rowCount()); - for (int i = 0; i < m_Model->rowCount(); ++i) { - QVariant data = m_Model->data(m_Model->index(i, 0), m_Role); - if (data.isValid()) { - QColor col = data.value(); - painter.setPen(col); - painter.setBrush(col); - painter.drawRect(QRect(2, i * scale - 2, handleRect.width() - 5, 3)); - } + for (int i = 0; i < m_Model->rowCount(); ++i) { + QVariant data = m_Model->data(m_Model->index(i, 0), m_Role); + if (data.isValid()) { + QColor col = data.value(); + painter.setPen(col); + painter.setBrush(col); + painter.drawRect(QRect(2, i * scale - 2, handleRect.width() - 5, 3)); } + } } -- cgit v1.3.1