merged from 0.6.7 codebase

1 files changed, 52 insertions, 52 deletions

diff --git a/application/widgets/LabeledToolButton.cpp b/application/widgets/LabeledToolButton.cpp
index 744d2e00..ab273b65 100644
--- a/application/widgets/LabeledToolButton.cpp
+++ b/application/widgets/LabeledToolButton.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,32 +28,32 @@
  */
 
 LabeledToolButton::LabeledToolButton(QWidget * parent)
-	: QToolButton(parent)
-	, m_label(new QLabel(this))
+    : QToolButton(parent)
+    , m_label(new QLabel(this))
 {
-	//QToolButton::setText(" ");
-	m_label->setWordWrap(true);
-	m_label->setMouseTracking(false);
-	m_label->setAlignment(Qt::AlignCenter);
-	m_label->setTextInteractionFlags(Qt::NoTextInteraction);
-	// somehow, this makes word wrap work in the QLabel. yay.
-	//m_label->setMinimumWidth(100);
+    //QToolButton::setText(" ");
+    m_label->setWordWrap(true);
+    m_label->setMouseTracking(false);
+    m_label->setAlignment(Qt::AlignCenter);
+    m_label->setTextInteractionFlags(Qt::NoTextInteraction);
+    // somehow, this makes word wrap work in the QLabel. yay.
+    //m_label->setMinimumWidth(100);
 }
 
 QString LabeledToolButton::text() const
 {
-	return m_label->text();
+    return m_label->text();
 }
 
 void LabeledToolButton::setText(const QString & text)
 {
-	m_label->setText(text);
+    m_label->setText(text);
 }
 
 void LabeledToolButton::setIcon(QIcon icon)
 {
-	m_icon = icon;
-	resetIcon();
+    m_icon = icon;
+    resetIcon();
 }
 
 
@@ -62,54 +62,54 @@ void LabeledToolButton::setIcon(QIcon icon)
 */
 QSize LabeledToolButton::sizeHint() const
 {
-	/*
-	Q_D(const QToolButton);
-	if (d->sizeHint.isValid())
-		return d->sizeHint;
-	*/
-	ensurePolished();
+    /*
+    Q_D(const QToolButton);
+    if (d->sizeHint.isValid())
+        return d->sizeHint;
+    */
+    ensurePolished();
 
-	int w = 0, h = 0;
-	QStyleOptionToolButton opt;
-	initStyleOption(&opt);
-	QSize sz =m_label->sizeHint();
-	w = sz.width();
-	h = sz.height();
+    int w = 0, h = 0;
+    QStyleOptionToolButton opt;
+    initStyleOption(&opt);
+    QSize sz =m_label->sizeHint();
+    w = sz.width();
+    h = sz.height();
 
-	opt.rect.setSize(QSize(w, h)); // PM_MenuButtonIndicator depends on the height
-	if (popupMode() == MenuButtonPopup)
-		w += style()->pixelMetric(QStyle::PM_MenuButtonIndicator, &opt, this);
-	
-	QSize rawSize = style()->sizeFromContents(QStyle::CT_ToolButton, &opt, QSize(w, h), this);
-	QSize sizeHint = rawSize.expandedTo(QApplication::globalStrut());
-	return sizeHint;
+    opt.rect.setSize(QSize(w, h)); // PM_MenuButtonIndicator depends on the height
+    if (popupMode() == MenuButtonPopup)
+        w += style()->pixelMetric(QStyle::PM_MenuButtonIndicator, &opt, this);
+    
+    QSize rawSize = style()->sizeFromContents(QStyle::CT_ToolButton, &opt, QSize(w, h), this);
+    QSize sizeHint = rawSize.expandedTo(QApplication::globalStrut());
+    return sizeHint;
 }
 
 
 
 void LabeledToolButton::resizeEvent(QResizeEvent * event)
 {
-	m_label->setGeometry(QRect(4, 4, width()-8, height()-8));
-	if(!m_icon.isNull())
-	{
-		resetIcon();
-	}
-	QWidget::resizeEvent(event);
+    m_label->setGeometry(QRect(4, 4, width()-8, height()-8));
+    if(!m_icon.isNull())
+    {
+        resetIcon();
+    }
+    QWidget::resizeEvent(event);
 }
 
 void LabeledToolButton::resetIcon()
 {
-	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 );
+    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 );
 }