Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move scrollbar drawing code into its own function

Browse Source
This commit is contained in:
Kovid Goyal 2025-05-21 14:38:56 +05:30
parent c3b221e980
commit c2a525ef97
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 74 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/calibre/gui2/progress_indicator/CalibreStyle.cpp
View File

@ -138,6 +138,72 @@ draw_arrow(Qt::ArrowType type, QPainter *painter, const QStyleOption *option, co
painter->drawPixmap(rect, cachePixmap);
}
// scrollbar {{{
void
CalibreStyle::draw_scrollbar(const QStyleOptionSlider *scroll_bar, QPainter * painter, const QWidget * widget) const {
bool horizontal = scroll_bar->orientation == Qt::Horizontal;
QColor outline = scroll_bar->palette.window().color().darker(140);
QColor alphaOutline = outline;
alphaOutline.setAlpha(180);
QRect scrollBarSubLine = subControlRect(CC_ScrollBar, scroll_bar, SC_ScrollBarSubLine, widget);
QRect scrollBarAddLine = subControlRect(CC_ScrollBar, scroll_bar, SC_ScrollBarAddLine, widget);
QRect scrollBarSlider = subControlRect(CC_ScrollBar, scroll_bar, SC_ScrollBarSlider, widget);
QRect scrollBarGroove = subControlRect(CC_ScrollBar, scroll_bar, SC_ScrollBarGroove, widget);
QRect rect = scroll_bar->rect;
// Paint groove
QLinearGradient gradient(rect.center().x(), rect.top(), rect.center().x(), rect.bottom());
if (!horizontal) gradient = QLinearGradient(rect.left(), rect.center().y(), rect.right(), rect.center().y());
QColor buttonColor = scroll_bar->palette.color(QPalette::Button);
gradient.setColorAt(0, buttonColor.darker(107));
gradient.setColorAt(0.1, buttonColor.darker(105));
gradient.setColorAt(0.9, buttonColor.darker(105));
gradient.setColorAt(1, buttonColor.darker(107));
painter->save();
painter->setPen(Qt::NoPen);
painter->fillRect(rect, gradient);
if (horizontal) painter->drawLine(rect.topLeft(), rect.topRight());
else painter->drawLine(rect.topLeft(), rect.bottomLeft());
QColor subtleEdge = alphaOutline;
subtleEdge.setAlpha(40);
painter->setPen(subtleEdge);
painter->setBrush(Qt::NoBrush);
painter->drawRect(scrollBarGroove.adjusted(1, 0, -1, -1));
painter->restore();
// Paint slider
gradient = QLinearGradient(scrollBarSlider.center().x(), scrollBarSlider.top(), scrollBarSlider.center().x(), scrollBarSlider.bottom());
if (!horizontal) gradient = QLinearGradient(scrollBarSlider.left(), scrollBarSlider.center().y(), scrollBarSlider.right(), scrollBarSlider.center().y());
QColor m = scroll_bar->palette.window().color().lighter(130);
if (scroll_bar->state & State_MouseOver) {
gradient.setColorAt(0, m.lighter()); gradient.setColorAt(1, m.lighter(175));
} else {
gradient.setColorAt(0, m); gradient.setColorAt(1, m.lighter());
}
painter->save();
painter->setRenderHint(QPainter::Antialiasing, true);
painter->setBrush(gradient); painter->setPen(alphaOutline);
painter->drawRoundedRect(QRectF(scrollBarSlider.adjusted(horizontal ? -1 : 0, horizontal ? 0 : -1, horizontal ? 0 : -1, horizontal ? -1 : 0)), 5., 5.);
painter->restore();
// Paint arrows
QRect upRect = scrollBarSubLine.adjusted(horizontal ? 0 : 1, horizontal ? 1 : 0, horizontal ? -2 : -1, horizontal ? -1 : -2);
Qt::ArrowType arrowType = Qt::UpArrow;
if (horizontal) arrowType = scroll_bar->direction == Qt::LeftToRight ? Qt::LeftArrow : Qt::RightArrow;
QColor arrowColor = scroll_bar->palette.windowText().color();
draw_arrow(arrowType, painter, scroll_bar, upRect, arrowColor);
QRect downRect = scrollBarAddLine.adjusted(1, 1, -1, -1);
arrowType = Qt::DownArrow;
if (horizontal) arrowType = scroll_bar->direction == Qt::LeftToRight ? Qt::RightArrow : Qt::LeftArrow;
draw_arrow(arrowType, painter, scroll_bar, downRect, arrowColor);
return;
} // }}}
CalibreStyle::CalibreStyle(int transient_scroller) : QProxyStyle(QString::fromUtf8("Fusion")), transient_scroller(transient_scroller) {
setObjectName(QString("calibre"));
@ -209,76 +275,12 @@ void CalibreStyle::drawComplexControl(ComplexControl control, const QStyleOption
}
break; /// }}}
case CC_ScrollBar: { // {{{
if (transient_scroller) break;
case CC_ScrollBar: {
const QStyleOptionSlider *scroll_bar = qstyleoption_cast<const QStyleOptionSlider *>(option);
if (scroll_bar && is_color_dark(option->palette.color(QPalette::Window))) {
bool horizontal = scroll_bar->orientation == Qt::Horizontal;
QColor outline = option->palette.window().color().darker(140);
QColor alphaOutline = outline;
alphaOutline.setAlpha(180);
QRect scrollBarSubLine = subControlRect(control, scroll_bar, SC_ScrollBarSubLine, widget);
QRect scrollBarAddLine = subControlRect(control, scroll_bar, SC_ScrollBarAddLine, widget);
QRect scrollBarSlider = subControlRect(control, scroll_bar, SC_ScrollBarSlider, widget);
QRect scrollBarGroove = subControlRect(control, scroll_bar, SC_ScrollBarGroove, widget);
QRect rect = option->rect;
{ // Paint groove
QLinearGradient gradient(rect.center().x(), rect.top(), rect.center().x(), rect.bottom());
if (!horizontal) gradient = QLinearGradient(rect.left(), rect.center().y(), rect.right(), rect.center().y());
QColor buttonColor = option->palette.color(QPalette::Button);
gradient.setColorAt(0, buttonColor.darker(107));
gradient.setColorAt(0.1, buttonColor.darker(105));
gradient.setColorAt(0.9, buttonColor.darker(105));
gradient.setColorAt(1, buttonColor.darker(107));
painter->save();
painter->setPen(Qt::NoPen);
painter->fillRect(rect, gradient);
if (horizontal) painter->drawLine(rect.topLeft(), rect.topRight());
else painter->drawLine(rect.topLeft(), rect.bottomLeft());
QColor subtleEdge = alphaOutline;
subtleEdge.setAlpha(40);
painter->setPen(subtleEdge);
painter->setBrush(Qt::NoBrush);
painter->drawRect(scrollBarGroove.adjusted(1, 0, -1, -1));
painter->restore();
}
{ // Paint slider
QLinearGradient gradient(scrollBarSlider.center().x(), scrollBarSlider.top(), scrollBarSlider.center().x(), scrollBarSlider.bottom());
if (!horizontal) gradient = QLinearGradient(scrollBarSlider.left(), scrollBarSlider.center().y(), scrollBarSlider.right(), scrollBarSlider.center().y());
QColor m = option->palette.window().color().lighter(130);
if (option->state & State_MouseOver) {
gradient.setColorAt(0, m.lighter()); gradient.setColorAt(1, m.lighter(175));
} else {
gradient.setColorAt(0, m); gradient.setColorAt(1, m.lighter());
}
painter->save();
painter->setRenderHint(QPainter::Antialiasing, true);
painter->setBrush(gradient); painter->setPen(alphaOutline);
painter->drawRoundedRect(QRectF(scrollBarSlider.adjusted(horizontal ? -1 : 0, horizontal ? 0 : -1, horizontal ? 0 : -1, horizontal ? -1 : 0)), 5., 5.);
painter->restore();
}
{ // Paint arrows
QRect upRect = scrollBarSubLine.adjusted(horizontal ? 0 : 1, horizontal ? 1 : 0, horizontal ? -2 : -1, horizontal ? -1 : -2);
Qt::ArrowType arrowType = Qt::UpArrow;
if (horizontal) arrowType = option->direction == Qt::LeftToRight ? Qt::LeftArrow : Qt::RightArrow;
QColor arrowColor = option->palette.windowText().color();
draw_arrow(arrowType, painter, option, upRect, arrowColor);
QRect downRect = scrollBarAddLine.adjusted(1, 1, -1, -1);
arrowType = Qt::DownArrow;
if (horizontal) arrowType = option->direction == Qt::LeftToRight ? Qt::RightArrow : Qt::LeftArrow;
draw_arrow(arrowType, painter, option, downRect, arrowColor);
}
if (!transient_scroller && scroll_bar && is_color_dark(option->palette.color(QPalette::Window))) {
this->draw_scrollbar(scroll_bar, painter, widget);
return;
}} break; // }}}
}} break;
default:
break;

4
src/calibre/gui2/progress_indicator/QProgressIndicator.h
View File

@ -10,6 +10,7 @@
#include <QParallelAnimationGroup>
#include <QProxyStyle>
#include <QDialogButtonBox>
#include <QStyleOptionSlider>
#define arc_length_max 0.734f
#define arc_length_min 0.02f
@ -95,6 +96,9 @@ class CalibreStyle : public QProxyStyle {
QDialogButtonBox::ButtonLayout button_layout;
int transient_scroller;
private:
void draw_scrollbar(const QStyleOptionSlider *scroll_bar, QPainter * painter, const QWidget * widget) const;
public:
CalibreStyle(int transient_scroller);
virtual int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const;