feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Fix theming of KitAreaWidget

Browse Source 
Let the parent widget (MiniProjectTargetSelector) paint the background.
Remove all unneeded QStyle and QPalette setters.

(Note: select a kit with mutable device to see the fix)

Change-Id: I9166659580c3cb3047155ccea65c749d5d542f07
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Alessandro Portale
2019-12-19 17:17:54 +01:00
parent 4bd0b9d101
commit 6b38f0c47d
4 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -95,11 +95,6 @@ private:
m_chooser->setFileName(SysRootKitAspect::sysRoot(m_kit)); m_chooser->setFileName(SysRootKitAspect::sysRoot(m_kit));
} }
void setPalette(const QPalette &p) override
{
KitAspectWidget::setPalette(p);
}
void pathWasChanged() void pathWasChanged()
{ {
m_ignoreChange = true; m_ignoreChange = true;

16
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -727,22 +727,6 @@ QString KitAspectWidget::msgManage()
return tr("Manage..."); return tr("Manage...");
} }
void KitAspectWidget::setPalette(const QPalette &p)
{
if (mainWidget())
mainWidget()->setPalette(p);
if (buttonWidget())
buttonWidget()->setPalette(p);
}
void KitAspectWidget::setStyle(QStyle *s)
{
if (mainWidget())
mainWidget()->setStyle(s);
if (buttonWidget())
buttonWidget()->setStyle(s);
}
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// KitFeatureProvider: // KitFeatureProvider:
// -------------------------------------------------------------------- // --------------------------------------------------------------------

7
src/plugins/projectexplorer/kitmanager.h
View File

@@ -38,10 +38,6 @@
#include <functional> #include <functional>
QT_BEGIN_NAMESPACE
class QStyle;
QT_END_NAMESPACE
namespace Utils { namespace Utils {
class Environment; class Environment;
class FilePath; class FilePath;
@@ -147,9 +143,6 @@ public:
Kit *kit() const { return m_kit; } Kit *kit() const { return m_kit; }
virtual void setPalette(const QPalette &p);
virtual void setStyle(QStyle *s);
signals: signals:
void dirty(); void dirty();

4
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -613,7 +613,6 @@ KitAreaWidget::KitAreaWidget(QWidget *parent) : QWidget(parent),
m_layout(new QGridLayout(this)) m_layout(new QGridLayout(this))
{ {
m_layout->setContentsMargins(3, 3, 3, 3); m_layout->setContentsMargins(3, 3, 3, 3);
setAutoFillBackground(true);
connect(KitManager::instance(), &KitManager::kitUpdated, this, &KitAreaWidget::updateKit); connect(KitManager::instance(), &KitManager::kitUpdated, this, &KitAreaWidget::updateKit);
} }
@@ -643,9 +642,6 @@ void KitAreaWidget::setKit(Kit *k)
QLabel *label = new QLabel(aspect->displayName()); QLabel *label = new QLabel(aspect->displayName());
m_labels << label; m_labels << label;
widget->setStyle(QStyleFactory::create(QLatin1String("fusion")));
widget->setPalette(palette());
m_layout->addWidget(label, row, 0); m_layout->addWidget(label, row, 0);
m_layout->addWidget(widget->mainWidget(), row, 1); m_layout->addWidget(widget->mainWidget(), row, 1);
m_layout->addWidget(widget->buttonWidget(), row, 2); m_layout->addWidget(widget->buttonWidget(), row, 2);