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

ProjectExplorer: Small welcome page improvement

Browse Source 
Use the complete height of the (unexpanded) session label for the click-
to-open region. Also, give some magic numbers a name.

Change-Id: Ie972d669cca943105cdd2e7e99394b61ca0a6e37
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Alessandro Portale
2017-04-03 13:55:47 +02:00
parent f1b50837e4
commit f23e454370
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/projectwelcomepage.cpp
View File

@@ -56,6 +56,7 @@ using namespace Core;
using namespace Utils; using namespace Utils;
const int LINK_HEIGHT = 35; const int LINK_HEIGHT = 35;
const int SESSION_LINE_HEIGHT = 30;
const char PROJECT_BASE_ID[] = "Welcome.OpenRecentProject"; const char PROJECT_BASE_ID[] = "Welcome.OpenRecentProject";
namespace ProjectExplorer { namespace ProjectExplorer {
@@ -292,7 +293,7 @@ public:
if (isActiveSession && !isDefaultVirgin) if (isActiveSession && !isDefaultVirgin)
fullSessionName = ProjectWelcomePage::tr("%1 (current session)").arg(fullSessionName); fullSessionName = ProjectWelcomePage::tr("%1 (current session)").arg(fullSessionName);
const QRect switchRect = QRect(x, y, rc.width() - 24, firstBase + 3 - y); const QRect switchRect = QRect(x, y, rc.width() - 24, SESSION_LINE_HEIGHT);
const bool switchActive = switchRect.contains(mousePos); const bool switchActive = switchRect.contains(mousePos);
painter->setPen(linkColor); painter->setPen(linkColor);
painter->setFont(sizedFont(13, option.widget, switchActive)); painter->setFont(sizedFont(13, option.widget, switchActive));
@@ -350,7 +351,7 @@ public:
QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &idx) const final QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &idx) const final
{ {
int h = 30; int h = SESSION_LINE_HEIGHT;
QString sessionName = idx.data(Qt::DisplayRole).toString(); QString sessionName = idx.data(Qt::DisplayRole).toString();
if (m_expandedSessions.contains(sessionName)) { if (m_expandedSessions.contains(sessionName)) {
QStringList projects = SessionManager::projectsForSessionName(sessionName); QStringList projects = SessionManager::projectsForSessionName(sessionName);
@@ -364,7 +365,7 @@ public:
{ {
if (ev->type() == QEvent::MouseButtonRelease) { if (ev->type() == QEvent::MouseButtonRelease) {
const QPoint pos = static_cast<QMouseEvent *>(ev)->pos(); const QPoint pos = static_cast<QMouseEvent *>(ev)->pos();
const QRect rc(option.rect.right() - 24, option.rect.top(), 24, 30); const QRect rc(option.rect.right() - 24, option.rect.top(), 24, SESSION_LINE_HEIGHT);
const QString sessionName = idx.data(Qt::DisplayRole).toString(); const QString sessionName = idx.data(Qt::DisplayRole).toString();
if (rc.contains(pos)) { if (rc.contains(pos)) {
// The expand/collapse "button". // The expand/collapse "button".