Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-23 08:20:01 +01:00
Code Issues Releases Wiki Activity

code optimized & added paintevent entry for theme change

Browse Source 
Update sliderwidget.cpp
This commit is contained in:
narunlifescience 2015-09-18 20:36:31 -05:00
parent 85d4340bfe
commit 90c09d1d0a
2 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/widgets/sliderwidget.cpp
View File

@ -198,29 +198,11 @@ Amarok::VolumeSlider::VolumeSlider(QWidget* parent, uint max)
m_pixmapInset(QPixmap(volumePixmapDraw ())) {
setFocusPolicy(Qt::NoFocus);
// Store window text color to check theme change at paintEvent
// Store theme colors to check theme change at paintEvent
m_previous_theme_text_color = palette().color(QPalette::WindowText);
m_previous_theme_highlight_color = palette().color(QPalette::Highlight);
// BEGIN Calculate handle animation pixmaps for mouse-over effect
QImage pixmapHandle(":volumeslider-handle.png");
QImage pixmapHandleGlow(VolumeSliderHandleGlow());
float opacity = 0.0;
const float step = 1.0 / ANIM_MAX;
QImage dst;
for (int i = 0; i < ANIM_MAX; ++i) {
dst = pixmapHandle.copy();
QPainter p(&dst);
p.setOpacity(opacity);
p.drawImage(0, 0, pixmapHandleGlow);
p.end();
m_handlePixmaps.append(QPixmap::fromImage(dst));
opacity += step;
}
// END
VolumeSliderHandle();
generateGradient();
setMinimumWidth(m_pixmapInset.width());
@ -310,6 +292,11 @@ void Amarok::VolumeSlider::paintEvent(QPaintEvent*) {
m_previous_theme_text_color = palette().color(QPalette::WindowText);
}
if (m_previous_theme_highlight_color != palette().color(QPalette::Highlight)) {
VolumeSliderHandle();
m_previous_theme_highlight_color = palette().color(QPalette::Highlight);
}
p.drawPixmap(0, 0, m_pixmapGradient, 0, 0, offset + padding, 0);
p.drawPixmap(0, 0, m_pixmapInset);
p.drawPixmap(offset - m_handlePixmaps[0].width() / 2 + padding, 0,
@ -367,22 +354,40 @@ QPixmap Amarok::VolumeSlider::volumePixmapDraw () const {
return pixmap;
}
QImage Amarok::VolumeSlider::VolumeSliderHandleGlow() const {
QImage mask(":/volumeslider-handle_glow.png");
void Amarok::VolumeSlider::VolumeSliderHandle() {
QImage pixmapHandle(":volumeslider-handle.png");
QImage pixmapHandleGlow(":/volumeslider-handle_glow.png");
QImage glow_image(mask.size(), QImage::Format_ARGB32_Premultiplied);
QPainter painter(&glow_image);
painter.fillRect(glow_image.rect(), QBrush(palette().color(QPalette::Highlight)));
QImage pixmapHandleGlow_image(pixmapHandleGlow.size(), QImage::Format_ARGB32_Premultiplied);
QPainter painter(&pixmapHandleGlow_image);
painter.setRenderHint(QPainter::Antialiasing);
painter.setRenderHint(QPainter::SmoothPixmapTransform);
painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
// repaint volume slider handle glow image with theme highlight color
painter.drawImage(0, 0, mask);
painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
painter.fillRect(pixmapHandleGlow_image.rect(), QBrush(palette().color(QPalette::Highlight)));
painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
painter.drawImage(0, 0, pixmapHandleGlow);
// Overlay the volume slider handle image
painter.drawImage(0, 0, QImage(":/volumeslider-handle.png"));
// Return QImage
return glow_image;
painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
painter.drawImage(0, 0, pixmapHandle);
// BEGIN Calculate handle animation pixmaps for mouse-over effect
float opacity = 0.0;
const float step = 1.0 / ANIM_MAX;
QImage dst;
m_handlePixmaps.clear();
for (int i = 0; i < ANIM_MAX; ++i) {
dst = pixmapHandle.copy();
QPainter p(&dst);
p.setOpacity(opacity);
p.drawImage(0, 0, pixmapHandleGlow_image);
p.end();
m_handlePixmaps.append(QPixmap::fromImage(dst));
opacity += step;
}
// END
}

3
src/widgets/sliderwidget.h
View File

@ -99,7 +99,7 @@ class VolumeSlider : public Slider {
public:
VolumeSlider(QWidget* parent, uint max = 0);
QPixmap volumePixmapDraw() const;
QImage VolumeSliderHandleGlow() const;
void VolumeSliderHandle();
protected:
virtual void paintEvent(QPaintEvent*);
@ -132,6 +132,7 @@ class VolumeSlider : public Slider {
QPixmap m_pixmapGradient;
QColor m_previous_theme_text_color;
QColor m_previous_theme_highlight_color;
QList<QPixmap> m_handlePixmaps;
};