diff options
| author | Andre de la Rocha <andre.rocha@qt.io> | 2017-10-25 15:35:30 +0200 |
|---|---|---|
| committer | Andre de la Rocha <andre.rocha@qt.io> | 2017-11-01 18:17:53 +0000 |
| commit | 17bdee86da84c6718fc1bbe8cedf5bdf07240837 (patch) | |
| tree | 1dd0d9595a3e83e03ea3447cc265146f164dfffb /examples/winextras/musicplayer/volumebutton.cpp | |
| parent | 07f6d25a00af112d46e939992fb9cf42879fc7c1 (diff) | |
Revamp Qt Windows Extras examples
Use nullptr, member initialization, new connect syntax, QStringLiteral, etc.
Change-Id: I1404701fcc227f8133bc22548ea1cee02eab4ed9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Diffstat (limited to 'examples/winextras/musicplayer/volumebutton.cpp')
| -rw-r--r-- | examples/winextras/musicplayer/volumebutton.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/examples/winextras/musicplayer/volumebutton.cpp b/examples/winextras/musicplayer/volumebutton.cpp index 44be5cf..9682b6e 100644 --- a/examples/winextras/musicplayer/volumebutton.cpp +++ b/examples/winextras/musicplayer/volumebutton.cpp @@ -60,8 +60,7 @@ VolumeButton::VolumeButton(QWidget *parent) : label->setNum(100); label->setMinimumWidth(label->sizeHint().width()); - typedef void(QLabel::*IntSlot)(int); - connect(slider, &QAbstractSlider::valueChanged, label, static_cast<IntSlot>(&QLabel::setNum)); + connect(slider, &QAbstractSlider::valueChanged, label, QOverload<int>::of(&QLabel::setNum)); QBoxLayout *popupLayout = new QHBoxLayout(popup); popupLayout->setMargin(2); @@ -101,14 +100,17 @@ void VolumeButton::setVolume(int volume) //! [0] void VolumeButton::stylize() { - if (QtWin::isCompositionEnabled()) { - QtWin::enableBlurBehindWindow(menu); - QString css("QMenu { border: 1px solid %1; border-radius: 2px; background: transparent; }"); - menu->setStyleSheet(css.arg(QtWin::realColorizationColor().name())); - } else { - QtWin::disableBlurBehindWindow(menu); - QString css("QMenu { border: 1px solid black; background: %1; }"); - menu->setStyleSheet(css.arg(QtWin::realColorizationColor().name())); + if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows8) { + // Set styling options relevant only to Windows 7. + if (QtWin::isCompositionEnabled()) { + QtWin::enableBlurBehindWindow(menu); + QString css("QMenu { border: 1px solid %1; border-radius: 2px; background: transparent; }"); + menu->setStyleSheet(css.arg(QtWin::realColorizationColor().name())); + } else { + QtWin::disableBlurBehindWindow(menu); + QString css("QMenu { border: 1px solid black; background: %1; }"); + menu->setStyleSheet(css.arg(QtWin::realColorizationColor().name())); + } } } //! [0] |