NOISSUE fix display of svg icons in instance toolbar
This commit is contained in:
		@@ -99,23 +99,17 @@ void LabeledToolButton::resizeEvent(QResizeEvent * event)
 | 
			
		||||
 | 
			
		||||
void LabeledToolButton::resetIcon()
 | 
			
		||||
{
 | 
			
		||||
	// prevent the label from changing our height
 | 
			
		||||
	auto sizes = m_icon.availableSizes();
 | 
			
		||||
	if(sizes.count() > 0)
 | 
			
		||||
	{
 | 
			
		||||
		//auto maxSz = size();
 | 
			
		||||
		auto iconSz = sizes[0];
 | 
			
		||||
		float w = iconSz.width();
 | 
			
		||||
		float h = iconSz.height();
 | 
			
		||||
		float ar = w/h;
 | 
			
		||||
		// FIXME: hardcoded max size of 160x80
 | 
			
		||||
		int newW = 80 * ar;
 | 
			
		||||
		if(newW > 160)
 | 
			
		||||
			newW = 160;
 | 
			
		||||
		QSize newSz (newW, 80);
 | 
			
		||||
		auto pixmap = m_icon.pixmap(newSz);
 | 
			
		||||
		m_label->setPixmap(pixmap);
 | 
			
		||||
		m_label->setMinimumHeight(80);
 | 
			
		||||
		m_label->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
 | 
			
		||||
	}
 | 
			
		||||
	auto iconSz = m_icon.actualSize(QSize(160, 80));
 | 
			
		||||
	float w = iconSz.width();
 | 
			
		||||
	float h = iconSz.height();
 | 
			
		||||
	float ar = w/h;
 | 
			
		||||
	// FIXME: hardcoded max size of 160x80
 | 
			
		||||
	int newW = 80 * ar;
 | 
			
		||||
	if(newW > 160)
 | 
			
		||||
		newW = 160;
 | 
			
		||||
	QSize newSz (newW, 80);
 | 
			
		||||
	auto pixmap = m_icon.pixmap(newSz);
 | 
			
		||||
	m_label->setPixmap(pixmap);
 | 
			
		||||
	m_label->setMinimumHeight(80);
 | 
			
		||||
	m_label->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user