From c3b4f276033ad024b649fae9a25a0a1fc2d6ea65 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 27 Nov 2012 10:14:15 +0100 Subject: [PATCH] QtBase: Fix painting example arthur background color The arthur style set the background color to a bright color and leave the foregroud color, for example for text, untouched. If you are using a color theme with bright foregroundcolors on your system this will result in unreadable text on push- and radio-buttons. The function drawControl is now reimplemented and the labels with text are drawn with an appropriate color. Change-Id: Ifd7f3a2b1c0305130255009c7733e0966830171a Reviewed-by: Gunnar Sletta --- examples/widgets/painting/shared/arthurstyle.cpp | 38 ++++++++++++++++++++++++ examples/widgets/painting/shared/arthurstyle.h | 7 ++--- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/examples/widgets/painting/shared/arthurstyle.cpp b/examples/widgets/painting/shared/arthurstyle.cpp index 7d56e55..78b48cc 100644 --- a/examples/widgets/painting/shared/arthurstyle.cpp +++ b/examples/widgets/painting/shared/arthurstyle.cpp @@ -311,6 +311,44 @@ void ArthurStyle::drawComplexControl(ComplexControl control, const QStyleOptionC return; } +void ArthurStyle::drawControl(QStyle::ControlElement element, const QStyleOption *option, + QPainter *painter, const QWidget *widget) const +{ + switch (element) { + case CE_RadioButtonLabel: + if (const QStyleOptionButton *button + = qstyleoption_cast(option)) { + + if (button->text.isEmpty()) { + QCommonStyle::drawControl(element, option, painter, widget); + } else { + painter->save(); + painter->setPen(Qt::black); + painter->drawText(button->rect, Qt::AlignVCenter, button->text); + painter->restore(); + } + } + break; + case CE_PushButtonLabel: + if (const QStyleOptionButton *button + = qstyleoption_cast(option)) { + + if (button->text.isEmpty()) { + QCommonStyle::drawControl(element, option, painter, widget); + } else { + painter->save(); + painter->setPen(Qt::black); + painter->drawText(button->rect, Qt::AlignVCenter | Qt::AlignHCenter, button->text); + painter->restore(); + } + } + break; + default: + QCommonStyle::drawControl(element, option, painter, widget); + break; + } +} + QRect ArthurStyle::subControlRect(ComplexControl control, const QStyleOptionComplex *option, SubControl subControl, const QWidget *widget) const { diff --git a/examples/widgets/painting/shared/arthurstyle.h b/examples/widgets/painting/shared/arthurstyle.h index 074437b..9eda158 100644 --- a/examples/widgets/painting/shared/arthurstyle.h +++ b/examples/widgets/painting/shared/arthurstyle.h @@ -55,8 +55,8 @@ public: void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = 0) const; -// void drawControl(ControlElement element, const QStyleOption *option, -// QPainter *painter, const QWidget *widget) const; + void drawControl(ControlElement element, const QStyleOption *option, + QPainter *painter, const QWidget *widget) const; void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget) const; QSize sizeFromContents(ContentsType type, const QStyleOption *option, @@ -66,9 +66,6 @@ public: QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const; -// SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, -// const QPoint &pos, const QWidget *widget = 0) const; - int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const; void polish(QPalette &palette); -- 2.7.4