From 66d74ac566723e7cef8a5802106db458936dd892 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 23 Jun 2020 12:35:42 +0200 Subject: [PATCH] Target selector: Make sure the run icon is not hidden under scrollbar Fixes: QTCREATORBUG-24148 Change-Id: Icae939d8f63a99b372f32d91d33acdfb2130a4f7 Reviewed-by: Alessandro Portale --- .../projectexplorer/miniprojecttargetselector.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 0057366a175..c44bb43daf3 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -68,6 +68,8 @@ using namespace Utils; namespace ProjectExplorer { namespace Internal { +const int RunColumnWidth = 30; + static QIcon createCenteredIcon(const QIcon &icon, const QIcon &overlay) { QPixmap targetPixmap; @@ -545,6 +547,8 @@ int SelectorView::optimalWidth() const void SelectorView::setOptimalWidth(int width) { m_optimalWidth = width; + if (model()->columnCount() == 2) + m_optimalWidth += RunColumnWidth; updateGeometry(); } @@ -950,7 +954,7 @@ void MiniProjectTargetSelector::doLayout(bool keepSize) QVector widths = listWidgetWidths(minWidth, 1000); - const int runColumnWidth = widths[RUN] == -1 ? 0 : 30; + const int runColumnWidth = widths[RUN] == -1 ? 0 : RunColumnWidth; int x = 0; for (int i = PROJECT; i < LAST; ++i) { int optimalWidth = widths[i]; @@ -968,7 +972,8 @@ void MiniProjectTargetSelector::doLayout(bool keepSize) x += optimalWidth + 1; //1 extra pixel for the separators or the right border } - m_listWidgets[RUN]->setColumnWidth(0, m_listWidgets[RUN]->size().width() - runColumnWidth); + m_listWidgets[RUN]->setColumnWidth(0, m_listWidgets[RUN]->size().width() - runColumnWidth + - m_listWidgets[RUN]->padding()); m_listWidgets[RUN]->setColumnWidth(1, runColumnWidth); m_summaryLabel->resize(x - 1, summaryLabelHeight); m_kitAreaWidget->resize(x - 1, kitAreaHeight);