hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix scaling of PixmapButton in layouts (#7053)

Browse Source
This commit is contained in:
Michael Gregorius
2024-01-08 15:44:58 +01:00
committed by GitHub
parent 18d34431b3
commit d945ac1cbe
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/PixmapButton.h
View File

@@ -56,6 +56,8 @@ protected:
void mouseReleaseEvent( QMouseEvent * _me ) override;
void mouseDoubleClickEvent( QMouseEvent * _me ) override;
private:
bool isActive() const;
private:
QPixmap m_activePixmap;

28
src/gui/widgets/PixmapButton.cpp
View File

@@ -50,20 +50,15 @@ PixmapButton::PixmapButton( QWidget * _parent, const QString & _name ) :
void PixmapButton::paintEvent( QPaintEvent * )
void PixmapButton::paintEvent(QPaintEvent*)
{
QPainter p( this );
QPainter p(this);
if( ( model() != nullptr && model()->value() ) || m_pressed )
QPixmap* pixmapToDraw = isActive() ? &m_activePixmap : &m_inactivePixmap;
if (!pixmapToDraw->isNull())
{
if( !m_activePixmap.isNull() )
{
p.drawPixmap( 0, 0, m_activePixmap );
}
}
else if( !m_inactivePixmap.isNull() )
{
p.drawPixmap( 0, 0, m_inactivePixmap );
p.drawPixmap(0, 0, *pixmapToDraw);
}
}
@@ -129,15 +124,20 @@ void PixmapButton::setInactiveGraphic( const QPixmap & _pm, bool _update )
QSize PixmapButton::sizeHint() const
{
if( ( model() != nullptr && model()->value() ) || m_pressed )
if (isActive())
{
return m_activePixmap.size() / devicePixelRatio();
return m_activePixmap.size();
}
else
{
return m_inactivePixmap.size() / devicePixelRatio();
return m_inactivePixmap.size();
}
}
bool PixmapButton::isActive() const
{
return (model() != nullptr && model()->value()) || m_pressed;
}
} // namespace lmms::gui