kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Start: Make the new StartPage look more like the old one

Browse Source 
Use style sheets to give visual feedback about hovered or clicked buttons & labels
This commit is contained in:
wmayer
2024-04-23 16:00:10 +02:00
parent 5d4ff908ff
commit 690b3c97e4
5 changed files with 151 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/Mod/Start/Gui/FileCardDelegate.cpp
View File

@@ -32,12 +32,13 @@
#include <QLabel>
#include <QModelIndex>
#include <QVBoxLayout>
#include <QGuiApplication>
#include <QApplication>
#endif
#include "FileCardDelegate.h"
#include "../App/DisplayedFilesModel.h"
#include "App/Application.h"
#include <App/Color.h>
#include <3rdParty/GSL/include/gsl/pointers>
using namespace Start;
@@ -49,6 +50,32 @@ FileCardDelegate::FileCardDelegate(QObject* parent)
"User parameter:BaseApp/Preferences/Mod/Start");
}
QColor FileCardDelegate::getBorderColor() const
{
QColor color(98, 160, 234); // NOLINT
uint32_t packed = App::Color::asPackedRGB<QColor>(color);
packed = _parameterGroup->GetUnsigned("FileThumbnailBorderColor", packed);
color = App::Color::fromPackedRGB<QColor>(packed);
return color;
}
QColor FileCardDelegate::getBackgroundColor() const
{
QColor color(221, 221, 221); // NOLINT
uint32_t packed = App::Color::asPackedRGB<QColor>(color);
packed = _parameterGroup->GetUnsigned("FileThumbnailBackgroundColor", packed);
color = App::Color::fromPackedRGB<QColor>(packed);
return color;
}
QColor FileCardDelegate::getSelectionColor() const
{
QColor color(38, 162, 105); // NOLINT
uint32_t packed = App::Color::asPackedRGB<QColor>(color);
packed = _parameterGroup->GetUnsigned("FileThumbnailSelectionColor", packed);
color = App::Color::fromPackedRGB<QColor>(packed);
return color;
}
void FileCardDelegate::paint(QPainter* painter,
const QStyleOptionViewItem& option,
@@ -63,6 +90,7 @@ void FileCardDelegate::paint(QPainter* painter,
auto path = index.data(static_cast<int>(DisplayedFilesModelRoles::path)).toString();
painter->save();
auto widget = gsl::owner<QWidget*>(new QWidget());
widget->setObjectName(QLatin1String("thumbnailWidget"));
auto layout = gsl::owner<QVBoxLayout*>(new QVBoxLayout());
widget->setLayout(layout);
auto thumbnail = gsl::owner<QLabel*>(new QLabel());
@@ -81,6 +109,40 @@ void FileCardDelegate::paint(QPainter* painter,
}
thumbnail->setFixedSize(thumbnailSize, thumbnailSize);
thumbnail->setSizePolicy(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Fixed);
if (option.state & QStyle::State_Selected) {
QColor color = getSelectionColor();
widget->setStyleSheet(QString::fromLatin1("QWidget#thumbnailWidget {"
" border: 2px solid rgb(%1, %2, %3);"
" border-radius: 4px;"
" padding: 2px;"
"}")
.arg(color.red())
.arg(color.green())
.arg(color.blue()));
}
else if (option.state & QStyle::State_MouseOver) {
QColor color = getBorderColor();
widget->setStyleSheet(QString::fromLatin1("QWidget#thumbnailWidget {"
" border: 2px solid rgb(%1, %2, %3);"
" border-radius: 4px;"
" padding: 2px;"
"}")
.arg(color.red())
.arg(color.green())
.arg(color.blue()));
}
else if (qApp->styleSheet().isEmpty()) {
QColor color = getBackgroundColor();
widget->setStyleSheet(QString::fromLatin1("QWidget#thumbnailWidget {"
" background-color: rgb(%1, %2, %3);"
" border-radius: 8px;"
"}")
.arg(color.red())
.arg(color.green())
.arg(color.blue()));
}
auto elided =
painter->fontMetrics().elidedText(baseName, Qt::TextElideMode::ElideRight, cardWidth);
auto name = gsl::owner<QLabel*>(new QLabel(elided));
@@ -103,7 +165,7 @@ QSize FileCardDelegate::sizeHint(const QStyleOptionViewItem& option, const QMode
Q_UNUSED(option)
Q_UNUSED(index)
auto thumbnailSize = _parameterGroup->GetInt("FileThumbnailIconsSize", 128); // NOLINT
auto cardSpacing = _parameterGroup->GetInt("FileCardSpacing", 20); // NOLINT
auto cardSpacing = _parameterGroup->GetInt("FileCardSpacing", 30); // NOLINT
auto cardWidth = thumbnailSize + cardSpacing;
auto font = QGuiApplication::font();

5
src/Mod/Start/Gui/FileCardDelegate.h
View File

@@ -44,6 +44,11 @@ public:
protected:
QPixmap generateThumbnail(const QString& path) const;
private:
QColor getBorderColor() const;
QColor getBackgroundColor() const;
QColor getSelectionColor() const;
private:
Base::Reference<ParameterGrp> _parameterGroup;
};

3
src/Mod/Start/Gui/FileCardView.cpp
View File

@@ -44,6 +44,8 @@ FileCardView::FileCardView(QWidget* parent)
setFlow(QListView::Flow::LeftToRight);
setResizeMode(QListView::ResizeMode::Adjust);
setUniformItemSizes(true);
setMouseTracking(true);
setSpacing(20);
}
int FileCardView::heightForWidth(int width) const
@@ -83,5 +85,4 @@ QSize FileCardView::sizeHint() const
cardSize.height() + 2 * cardSpacing};
}
} // namespace StartGui

91
src/Mod/Start/Gui/StartView.cpp
View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <QCoreApplication>
#include <QApplication>
#include <QCheckBox>
#include <QGridLayout>
#include <QLabel>
@@ -100,7 +100,7 @@ StartView::StartView(Gui::Document* pcDocument, QWidget* parent)
setObjectName(QLatin1String("StartView"));
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Start");
auto cardSpacing = hGrp->GetInt("FileCardSpacing", 20); // NOLINT
auto cardSpacing = hGrp->GetInt("FileCardSpacing", 30); // NOLINT
auto scrolledWidget = gsl::owner<QWidget*>(new QWidget(this));
_contents->setWidget(scrolledWidget);
@@ -165,7 +165,6 @@ StartView::StartView(Gui::Document* pcDocument, QWidget* parent)
configureRecentFilesListWidget(recentFilesListWidget, recentFilesLabel);
}
void StartView::configureNewFileButtons(QGridLayout* layout) const
{
auto newEmptyFile = createNewButton({tr("Empty file"),
@@ -187,14 +186,36 @@ void StartView::configureNewFileButtons(QGridLayout* layout) const
tr("Create an architectural project"),
QLatin1String(":/icons/ArchWorkbench.svg")});
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Start");
if (hGrp->GetBool("FileCardUseStyleSheet", true)) {
QString style = fileCardStyle();
newEmptyFile->setStyleSheet(style);
openFile->setStyleSheet(style);
partDesign->setStyleSheet(style);
assembly->setStyleSheet(style);
draft->setStyleSheet(style);
arch->setStyleSheet(style);
}
// TODO: Ensure all of the required WBs are actually available
// TODO: Make this layout more flexible (e.g. use a single line if possible)
layout->addWidget(partDesign, 0, 0);
layout->addWidget(assembly, 0, 1);
layout->addWidget(draft, 0, 2);
layout->addWidget(arch, 1, 0);
layout->addWidget(newEmptyFile, 1, 1);
layout->addWidget(openFile, 1, 2);
if (!hGrp->GetBool("FileCardSingleLine", true)) {
layout->addWidget(partDesign, 0, 0);
layout->addWidget(assembly, 0, 1);
layout->addWidget(draft, 0, 2);
layout->addWidget(arch, 1, 0);
layout->addWidget(newEmptyFile, 1, 1);
layout->addWidget(openFile, 1, 2);
}
else {
layout->addWidget(partDesign, 0, 0);
layout->addWidget(assembly, 0, 1);
layout->addWidget(draft, 0, 2);
layout->addWidget(arch, 0, 3);
layout->addWidget(newEmptyFile, 0, 4);
layout->addWidget(openFile, 0, 5);
}
connect(newEmptyFile, &QPushButton::clicked, this, &StartView::newEmptyFile);
connect(openFile, &QPushButton::clicked, this, &StartView::openExistingFile);
@@ -204,14 +225,60 @@ void StartView::configureNewFileButtons(QGridLayout* layout) const
connect(arch, &QPushButton::clicked, this, &StartView::newArchFile);
}
QString StartView::fileCardStyle() const
{
if (!qApp->styleSheet().isEmpty()) {
return {};
}
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Start");
auto getUserColor = [&hGrp](QColor color, const char* parameter) {
uint32_t packed = App::Color::asPackedRGB<QColor>(color);
packed = hGrp->GetUnsigned(parameter, packed);
color = App::Color::fromPackedRGB<QColor>(packed);
return color;
};
QColor background(221, 221, 221); // NOLINT
background = getUserColor(background, "FileCardBackgroundColor");
QColor hovered(98, 160, 234); // NOLINT
hovered = getUserColor(hovered, "FileCardBorderColor");
QColor pressed(38, 162, 105); // NOLINT
pressed = getUserColor(pressed, "FileCardSelectionColor");
return QString::fromLatin1("QPushButton {"
" background-color: rgb(%1, %2, %3);"
" border-radius: 8px;"
"}"
"QPushButton:hover {"
" border: 2px solid rgb(%4, %5, %6);"
"}"
"QPushButton:pressed {"
" border: 2px solid rgb(%7, %8, %9);"
"}")
.arg(background.red())
.arg(background.green())
.arg(background.blue())
.arg(hovered.red())
.arg(hovered.green())
.arg(hovered.blue())
.arg(pressed.red())
.arg(pressed.green())
.arg(pressed.blue());
}
void StartView::configureFileCardWidget(QListView* fileCardWidget)
{
auto delegate = gsl::owner<FileCardDelegate*>(new FileCardDelegate);
fileCardWidget->setItemDelegate(delegate);
fileCardWidget->setMinimumWidth(fileCardWidget->parentWidget()->width());
fileCardWidget->setGridSize(
fileCardWidget->itemDelegate()->sizeHint(QStyleOptionViewItem(),
fileCardWidget->model()->index(0, 0)));
// fileCardWidget->setGridSize(
// fileCardWidget->itemDelegate()->sizeHint(QStyleOptionViewItem(),
// fileCardWidget->model()->index(0, 0)));
}

1
src/Mod/Start/Gui/StartView.h
View File

@@ -85,6 +85,7 @@ protected:
void fileCardSelected(const QModelIndex& index);
void showOnStartupChanged(bool checked);
QString fileCardStyle() const;
private:
QScrollArea* _contents = nullptr;