FCL/sf/mw/qt: comparison src/gui/styles/qwindowsvistastyle.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 : QWindowsXPStyle(*new QWindowsVistaStylePrivate)
 {
 }
 //convert Qt state flags to uxtheme button states
-int buttonStateId(int flags, int partId)
+static int buttonStateId(int flags, int partId)
 {
 int stateId = 0;
 if (partId == BP_RADIOBUTTON || partId == BP_CHECKBOX) {
 if (!(flags & QStyle::State_Enabled))
 stateId = RBS_UNCHECKEDDISABLED;
 Q_ASSERT(1);
 }
 return stateId;
 }
-void Animation::paint(QPainter *painter, const QStyleOption *option)
+void QWindowsVistaAnimation::paint(QPainter *painter, const QStyleOption *option)
 {
 Q_UNUSED(option);
 Q_UNUSED(painter);
 }
 The result is a blended image consisting of ((alpha)*_primaryImage)
 + ((1-alpha)*_secondaryImage)
 */
-void Animation::drawBlendedImage(QPainter *painter, QRect rect, float alpha) {
+void QWindowsVistaAnimation::drawBlendedImage(QPainter *painter, QRect rect, float alpha) {
 if (_secondaryImage.isNull() || _primaryImage.isNull())
 return;
 if (_tempImage.isNull())
 _tempImage = _secondaryImage;
 /*! \internal
 Paints a transition state. The result will be a mix between the
 initial and final state of the transition, depending on the time
 difference between _startTime and current time.
 */
-void Transition::paint(QPainter *painter, const QStyleOption *option)
+void QWindowsVistaTransition::paint(QPainter *painter, const QStyleOption *option)
 {
 float alpha = 1.0;
 if (_duration > 0) {
 QTime current = QTime::currentTime();
 /*! \internal
 Paints a pulse. The result will be a mix between the primary and
 secondary pulse images depending on the time difference between
 _startTime and current time.
 */
-void Pulse::paint(QPainter *painter, const QStyleOption *option)
+void QWindowsVistaPulse::paint(QPainter *painter, const QStyleOption *option)
 {
 float alpha = 1.0;
 if (_duration > 0) {
 QTime current = QTime::currentTime();
 opt.rect.setRect(0, 0, option->rect.width(), option->rect.height());
 opt.state = (QStyle::State)oldState;
 startImage.fill(0);
 QPainter startPainter(&startImage);
-Animation *anim = d->widgetAnimation(widget);
+QWindowsVistaAnimation *anim = d->widgetAnimation(widget);
-Transition *t = new Transition;
+QWindowsVistaTransition *t = new QWindowsVistaTransition;
 t->setWidget(w);
 // If we have a running animation on the widget already, we will use that to paint the initial
 // state of the new transition, this ensures a smooth transition from a current animation such as a
 // pulsating default button into the intended target state.
 case PE_PanelButtonBevel:
 case PE_IndicatorCheckBox:
 case PE_IndicatorRadioButton:
 {
-if (Animation *a = d->widgetAnimation(widget)) {
+if (QWindowsVistaAnimation *a = d->widgetAnimation(widget)) {
 a->paint(painter, option);
 } else {
 QWindowsXPStyle::drawPrimitive(element, option, painter, widget);
 }
 }
 return;
 }
 break;
 case PE_FrameLineEdit:
-if (Animation *anim = d->widgetAnimation(widget)) {
+if (QWindowsVistaAnimation *anim = d->widgetAnimation(widget)) {
 anim->paint(painter, option);
 } else {
 QPainter *p = painter;
 QWidget *parentWidget = 0;
 if (widget) {
 }
 if (doTransition) {
 QImage startImage(option->rect.size(), QImage::Format_ARGB32_Premultiplied);
 QImage endImage(option->rect.size(), QImage::Format_ARGB32_Premultiplied);
-Animation *anim = d->widgetAnimation(widget);
+QWindowsVistaAnimation *anim = d->widgetAnimation(widget);
 QStyleOptionButton opt = *button;
 opt.state = (QStyle::State)oldState;
 startImage.fill(0);
-Transition *t = new Transition;
+QWindowsVistaTransition *t = new QWindowsVistaTransition;
 t->setWidget(w);
 QPainter startPainter(&startImage);
 if (!anim) {
 proxy()->drawControl(element, &opt, &startPainter, 0 /* Intentional */);
 switch (element) {
 case CE_PushButtonBevel:
 if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option))
 {
-if (Animation *anim = d->widgetAnimation(widget)) {
+if (QWindowsVistaAnimation *anim = d->widgetAnimation(widget)) {
 anim->paint(painter, option);
 } else {
 name = QLatin1String("BUTTON");
 partId = BP_PUSHBUTTON;
 if (btn->features & QStyleOptionButton::CommandLinkButton)
 if (widget && d->transitionsEnabled() && (btn->features & QStyleOptionButton::DefaultButton) &&
 !(state & (State_Sunken | State_On)) && !(state & State_MouseOver) &&
 (state & State_Enabled) && (state & State_Active))
 {
-Animation *anim = d->widgetAnimation(widget);
+QWindowsVistaAnimation *anim = d->widgetAnimation(widget);
 if (!anim && widget) {
 QImage startImage(option->rect.size(), QImage::Format_ARGB32_Premultiplied);
 startImage.fill(0);
 QImage alternateImage(option->rect.size(), QImage::Format_ARGB32_Premultiplied);
 alternateImage.fill(0);
-Pulse *pulse = new Pulse;
+QWindowsVistaPulse *pulse = new QWindowsVistaPulse;
 pulse->setWidget(const_cast<QWidget*>(widget));
 QPainter startPainter(&startImage);
 stateId = PBS_DEFAULTED;
 XPThemeData theme(widget, &startPainter, name, partId, stateId, rect);
 }
 if (const QProgressBar *progressbar = qobject_cast<const QProgressBar *>(widget)) {
 if (((progressbar->value() > 0  && d->transitionsEnabled()) || isIndeterminate)) {
 if (!d->widgetAnimation(progressbar) && progressbar->value() < progressbar->maximum()) {
-Animation *a = new Animation;
+QWindowsVistaAnimation *a = new QWindowsVistaAnimation;
 a->setWidget(const_cast<QWidget*>(widget));
 a->setStartTime(QTime::currentTime());
 d->startAnimation(a);
 }
 } else {
 theme.rect = option->rect;
 bool reverse = (bar->direction == Qt::LeftToRight && inverted) || (bar->direction == Qt::RightToLeft && !inverted);
 QTime current = QTime::currentTime();
 if (isIndeterminate) {
-if (Animation *a = d->widgetAnimation(widget)) {
+if (QWindowsVistaAnimation *a = d->widgetAnimation(widget)) {
 int glowSize = 120;
 int animationWidth = glowSize * 2 + (vertical ? theme.rect.height() : theme.rect.width());
 int animOffset = a->startTime().msecsTo(current) / 4;
 if (animOffset > animationWidth)
 a->setStartTime(QTime::currentTime());
 theme.rect = QStyle::visualRect(reverse ? Qt::RightToLeft : Qt::LeftToRight,
 option->rect, theme.rect);
 }
 d->drawBackground(theme);
-if (Animation *a = d->widgetAnimation(widget)) {
+if (QWindowsVistaAnimation *a = d->widgetAnimation(widget)) {
 int glowSize = 140;
 int animationWidth = glowSize * 2 + (vertical ? theme.rect.height() : theme.rect.width());
 int animOffset = a->startTime().msecsTo(current) / 4;
 theme.partId = vertical ? PP_MOVEOVERLAYVERT : PP_MOVEOVERLAY;
 if (animOffset > animationWidth) {
 }
 if (doTransition) {
 QImage startImage(option->rect.size(), QImage::Format_ARGB32_Premultiplied);
 QImage endImage(option->rect.size(), QImage::Format_ARGB32_Premultiplied);
-Animation *anim = d->widgetAnimation(widget);
+QWindowsVistaAnimation *anim = d->widgetAnimation(widget);
-Transition *t = new Transition;
+QWindowsVistaTransition *t = new QWindowsVistaTransition;
 t->setWidget(w);
 if (!anim) {
 if (const QStyleOptionComboBox *combo = qstyleoption_cast<const QStyleOptionComboBox*>(option)) {
 //Combo boxes are special cased to avoid cleartype issues
 startImage.fill(0);
 t->setDuration(150);
 else
 t->setDuration(500);
 }
-if (Animation *anim = d->widgetAnimation(widget)) {
+if (QWindowsVistaAnimation *anim = d->widgetAnimation(widget)) {
 anim->paint(painter, option);
 return;
 }
 }
 wi = cb->rect.width(),
 he = cb->rect.height();
 int xpos = x;
 int margin = cb->frame ? 3 : 0;
 int bmarg = cb->frame ? 2 : 0;
-xpos += wi - bmarg - 16;
+int arrowButtonWidth = bmarg + 16;
+xpos += wi - arrowButtonWidth;
 switch (subControl) {
 case SC_ComboBoxFrame:
 rect = cb->rect;
 break;
 case SC_ComboBoxArrow:
-rect.setRect(xpos, y , wi - xpos, he);
+rect.setRect(xpos, y , arrowButtonWidth, he);
 break;
 case SC_ComboBoxEditField:
 rect.setRect(x + margin, y + margin, wi - 2 * margin - 16, he - 2 * margin);
 break;
 case SC_ComboBoxListBoxPopup:
 !animations[i]->widget()->isVisible() ||
 animations[i]->widget()->window()->isMinimized() ||
 !animations[i]->running() ||
 !QWindowsVistaStylePrivate::useVista())
 {
-Animation *a = animations.takeAt(i);
+QWindowsVistaAnimation *a = animations.takeAt(i);
 delete a;
 }
 }
 if (animations.size() == 0 && animationTimer.isActive()) {
 animationTimer.stop();
 void QWindowsVistaStylePrivate::stopAnimation(const QWidget *w)
 {
 for (int i = animations.size() - 1 ; i >= 0 ; --i) {
 if (animations[i]->widget() == w) {
-Animation *a = animations.takeAt(i);
+QWindowsVistaAnimation *a = animations.takeAt(i);
 delete a;
 break;
 }
 }
 }
-void QWindowsVistaStylePrivate::startAnimation(Animation *t)
+void QWindowsVistaStylePrivate::startAnimation(QWindowsVistaAnimation *t)
 {
 Q_Q(QWindowsVistaStyle);
 stopAnimation(t->widget());
 animations.append(t);
 if (animations.size() > 0 && !animationTimer.isActive()) {
 }
 return false;
 }
-Animation * QWindowsVistaStylePrivate::widgetAnimation(const QWidget *widget) const
+QWindowsVistaAnimation * QWindowsVistaStylePrivate::widgetAnimation(const QWidget *widget) const
 {
 if (!widget)
 return 0;
-foreach (Animation *a, animations) {
+foreach (QWindowsVistaAnimation *a, animations) {
 if (a->widget() == widget)
 return a;
 }
 return 0;
 }

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7