summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-02-21 17:11:16 +0100
committerEike Ziller <eike.ziller@qt.io>2018-02-23 09:58:32 +0000
commit4adf04c79fec078e5d8b3806a5f8e6a2c9c30eb1 (patch)
tree97327386f9f12035b243452409bb7a7509a77691
parent5d9a623a33d4ddfc30011be8117434599ec7064f (diff)
downloadqt-creator-4adf04c79fec078e5d8b3806a5f8e6a2c9c30eb1.tar.gz
Work around Qt issue that setting 1.0 on opacity effect hides widget
Issue in Qt 5.9.4 & 5.10.1. This should be reverted the moment that is fixed. Task-number: QTCREATORBUG-19716 Change-Id: I9ae187a43d0054f162491308d30b9a5b96465ec4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r--src/libs/utils/detailswidget.cpp6
-rw-r--r--src/plugins/coreplugin/progressmanager/progressmanager.cpp6
-rw-r--r--src/plugins/projectexplorer/buildstepspage.cpp4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp
index ff03150af4..e0e4139f1d 100644
--- a/src/libs/utils/detailswidget.cpp
+++ b/src/libs/utils/detailswidget.cpp
@@ -189,9 +189,9 @@ void DetailsWidgetPrivate::changeHoverState(bool hovered)
if (!m_toolWidget)
return;
if (HostOsInfo::isMacHost())
- m_toolWidget->setOpacity(hovered ? 1.0 : 0);
+ m_toolWidget->setOpacity(hovered ? .999 : 0);
else
- m_toolWidget->fadeTo(hovered ? 1.0 : 0);
+ m_toolWidget->fadeTo(hovered ? .999 : 0);
m_hovered = hovered;
}
@@ -387,7 +387,7 @@ void DetailsWidget::setToolWidget(FadingPanel *widget)
d->m_grid->addWidget(d->m_toolWidget, 0, 1, 1, 1, Qt::AlignRight);
if (HostOsInfo::isMacHost())
- d->m_toolWidget->setOpacity(1.0);
+ d->m_toolWidget->setOpacity(.999);
d->changeHoverState(d->m_hovered);
}
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index e583aa0c79..108899bc76 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -273,7 +273,7 @@ ProgressManagerPrivate::ProgressManagerPrivate()
m_progressViewPinned(false),
m_hovered(false)
{
- m_opacityEffect->setOpacity(1);
+ m_opacityEffect->setOpacity(.999);
m_instance = this;
m_progressView = new ProgressView;
// withDelay, so the statusBarWidget has the chance to get the enter event
@@ -543,7 +543,7 @@ void ProgressManagerPrivate::stopFadeOfSummaryProgress()
{
if (m_opacityAnimation) {
m_opacityAnimation->stop();
- m_opacityEffect->setOpacity(1.);
+ m_opacityEffect->setOpacity(.999);
delete m_opacityAnimation;
}
}
@@ -689,7 +689,7 @@ void ProgressManagerPrivate::updateStatusDetailsWidget()
void ProgressManagerPrivate::summaryProgressFinishedFading()
{
m_summaryProgressWidget->setVisible(false);
- m_opacityEffect->setOpacity(1.);
+ m_opacityEffect->setOpacity(.999);
}
void ProgressManagerPrivate::progressDetailsToggled(bool checked)
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 64610a7b3e..7e17db63e1 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -136,9 +136,9 @@ void ToolWidget::setBuildStepEnabled(bool b)
m_firstWidget->fadeTo(m_targetOpacity);
} else {
if (HostOsInfo::isMacHost())
- m_firstWidget->setOpacity(1.0);
+ m_firstWidget->setOpacity(.999);
else
- m_firstWidget->fadeTo(1.0);
+ m_firstWidget->fadeTo(.999);
}
m_disableButton->setChecked(!b);
}