dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #587 from fbugno/issue515

Browse Source 
Fix HiDPI scaling for glow animation and drag over playlist
This commit is contained in:
Jonas Kvinge
2020-11-10 22:52:08 +01:00
committed by GitHub
parent 1ff1bf3292 f5785db163
commit 15b656b753
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/playlist/playlistview.cpp
View File

@@ -214,6 +214,9 @@ PlaylistView::PlaylistView(QWidget *parent)
dynamic_controls_->hide(); dynamic_controls_->hide();
// To proper scale all pixmaps
device_pixel_ratio_ = devicePixelRatioF();
// For fading // For fading
connect(fade_animation_, SIGNAL(valueChanged(qreal)), SLOT(FadePreviousBackgroundImage(qreal))); connect(fade_animation_, SIGNAL(valueChanged(qreal)), SLOT(FadePreviousBackgroundImage(qreal)));
fade_animation_->setDirection(QTimeLine::Backward); // 1.0 -> 0.0 fade_animation_->setDirection(QTimeLine::Backward); // 1.0 -> 0.0
@@ -557,7 +560,8 @@ void PlaylistView::UpdateCachedCurrentRowPixmap(QStyleOptionViewItem option, con
cached_current_row_row_ = idx.row(); cached_current_row_row_ = idx.row();
option.rect.moveTo(0, 0); option.rect.moveTo(0, 0);
cached_current_row_ = QPixmap(option.rect.size()); cached_current_row_ = QPixmap(option.rect.width() * device_pixel_ratio_, option.rect.height() * device_pixel_ratio_);
cached_current_row_.setDevicePixelRatio(device_pixel_ratio_);
cached_current_row_.fill(Qt::transparent); cached_current_row_.fill(Qt::transparent);
QPainter p(&cached_current_row_); QPainter p(&cached_current_row_);
@@ -1023,7 +1027,8 @@ void PlaylistView::paintEvent(QPaintEvent *event) {
if (drop_indicator_row_ != -1) { if (drop_indicator_row_ != -1) {
if (cached_tree_.isNull()) { if (cached_tree_.isNull()) {
cached_tree_ = QPixmap(size()); cached_tree_ = QPixmap(size().width() * device_pixel_ratio_, size().height() * device_pixel_ratio_);
cached_tree_.setDevicePixelRatio(device_pixel_ratio_);
cached_tree_.fill(Qt::transparent); cached_tree_.fill(Qt::transparent);
QPainter cache_painter(&cached_tree_); QPainter cache_painter(&cached_tree_);

1
src/playlist/playlistview.h
View File

@@ -220,6 +220,7 @@ class PlaylistView : public QTreeView {
Playlist *playlist_; Playlist *playlist_;
PlaylistHeader *header_; PlaylistHeader *header_;
qreal device_pixel_ratio_;
AppearanceSettingsPage::BackgroundImageType background_image_type_; AppearanceSettingsPage::BackgroundImageType background_image_type_;
QString background_image_filename_; QString background_image_filename_;
AppearanceSettingsPage::BackgroundImagePosition background_image_position_; AppearanceSettingsPage::BackgroundImagePosition background_image_position_;