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

Merge pull request #19901 from alfrix/start_fixes_1

Browse Source 
Start: fix text visbility
This commit is contained in:
Chris Hennes
2025-03-06 17:32:31 +00:00
committed by GitHub
parent b638832faf 48adc41817
commit 4eeca37bf3
7 changed files with 99 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/Stylesheets/FreeCAD Dark.qss
View File

@@ -2860,17 +2860,17 @@ QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item {
/*==================================================================================================
Start page
==================================================================================================*/
QWidget#thumbnailWidget {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #252525);
#thumbnailWidget {
background-color: #2f2f2f;
border-radius: 8px;
border: 1px solid #020202;
}
QWidget#thumbnailWidget[state="hovered"] {
#thumbnailWidget:hover {
border: 1px solid @ThemeAccentColor1;
}
QWidget#thumbnailWidget[state="pressed"] {
#thumbnailWidget:pressed {
border: 1px solid @ThemeAccentColor1;
}

8
src/Gui/Stylesheets/FreeCAD Light.qss
View File

@@ -2865,17 +2865,17 @@ QTreeView::branch#groupsTreeView:has-siblings:!adjoins-item {
/*==================================================================================================
Start page
==================================================================================================*/
QWidget#thumbnailWidget {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #f0f0f0, stop:1 #fdfdfd);
#thumbnailWidget {
background-color: #ededed;
border-radius: 8px;
border: 1px solid #ababab;
}
QWidget#thumbnailWidget[state="hovered"] {
#thumbnailWidget:hover {
border: 1px solid @ThemeAccentColor1;
}
QWidget#thumbnailWidget[state="pressed"] {
#thumbnailWidget:pressed {
border: 1px solid @ThemeAccentColor1;
}

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

@@ -33,6 +33,7 @@
#include <QModelIndex>
#include <QVBoxLayout>
#include <QApplication>
#include <QPushButton>
#endif
#include "FileCardDelegate.h"
@@ -44,152 +45,98 @@
using namespace Start;
FileCardDelegate::FileCardDelegate(QObject* parent)
: QAbstractItemDelegate(parent)
: QStyledItemDelegate(parent)
{
_parameterGroup = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Start");
_widget = std::make_unique<QWidget>();
_widget = std::make_unique<QPushButton>();
_widget->setObjectName(QLatin1String("thumbnailWidget"));
auto layout = gsl::owner<QVBoxLayout*>(new QVBoxLayout());
layout->setSpacing(0);
_widget->setLayout(layout);
}
QColor FileCardDelegate::getBorderColor() const
{
QColor color(98, 160, 234); // NOLINT
uint32_t packed = Base::Color::asPackedRGB<QColor>(color);
packed = _parameterGroup->GetUnsigned("FileThumbnailBorderColor", packed);
color = Base::Color::fromPackedRGB<QColor>(packed);
return color;
}
QColor FileCardDelegate::getBackgroundColor() const
{
QColor color(221, 221, 221); // NOLINT
uint32_t packed = Base::Color::asPackedRGB<QColor>(color);
packed = _parameterGroup->GetUnsigned("FileThumbnailBackgroundColor", packed);
color = Base::Color::fromPackedRGB<QColor>(packed);
return color;
}
QColor FileCardDelegate::getSelectionColor() const
{
QColor color(38, 162, 105); // NOLINT
uint32_t packed = Base::Color::asPackedRGB<QColor>(color);
packed = _parameterGroup->GetUnsigned("FileThumbnailSelectionColor", packed);
color = Base::Color::fromPackedRGB<QColor>(packed);
return color;
}
void FileCardDelegate::paint(QPainter* painter,
const QStyleOptionViewItem& option,
const QModelIndex& index) const
{
painter->save();
// Step 1: Styling
QStyleOptionButton buttonOption;
buttonOption.initFrom(_widget.get());
buttonOption.rect = option.rect;
buttonOption.state = QStyle::State_Enabled;
if ((option.state & QStyle::State_MouseOver) != 0) {
buttonOption.state |= QStyle::State_MouseOver;
}
if ((option.state & QStyle::State_Selected) != 0) {
buttonOption.state |= QStyle::State_On;
}
if ((option.state & QStyle::State_Sunken) != 0) {
buttonOption.state |= QStyle::State_Sunken;
}
QApplication::style()->drawControl(QStyle::CE_PushButton, &buttonOption, painter);
// Step 2: Fetch required data
auto thumbnailSize =
static_cast<int>(_parameterGroup->GetInt("FileThumbnailIconsSize", 128)); // NOLINT
auto cardWidth = thumbnailSize;
auto baseName = index.data(static_cast<int>(DisplayedFilesModelRoles::baseName)).toString();
auto elidedName = painter->fontMetrics().elidedText(baseName, Qt::ElideRight, thumbnailSize);
auto size = index.data(static_cast<int>(DisplayedFilesModelRoles::size)).toString();
auto image = index.data(static_cast<int>(DisplayedFilesModelRoles::image)).toByteArray();
auto path = index.data(static_cast<int>(DisplayedFilesModelRoles::path)).toString();
painter->save();
auto thumbnail = std::make_unique<QLabel>();
auto pixmap = std::make_unique<QPixmap>();
auto layout = qobject_cast<QVBoxLayout*>(_widget->layout());
QPixmap pixmap;
if (!image.isEmpty()) {
pixmap->loadFromData(image);
if (!pixmap->isNull()) {
auto scaled = pixmap->scaled(QSize(thumbnailSize, thumbnailSize),
Qt::AspectRatioMode::KeepAspectRatio,
Qt::TransformationMode::SmoothTransformation);
thumbnail->setPixmap(scaled);
}
pixmap.loadFromData(image);
}
else {
thumbnail->setPixmap(generateThumbnail(path));
}
thumbnail->setFixedSize(thumbnailSize, thumbnailSize);
thumbnail->setSizePolicy(QSizePolicy::Policy::Fixed, QSizePolicy::Policy::Fixed);
QString style = QStringLiteral("");
_widget->setProperty("state", QStringLiteral(""));
if (option.state & QStyle::State_Selected) {
_widget->setProperty("state", QStringLiteral("pressed"));
if (qApp->styleSheet().isEmpty()) {
QColor color = getSelectionColor();
style = QStringLiteral("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) {
_widget->setProperty("state", QStringLiteral("hovered"));
if (qApp->styleSheet().isEmpty()) {
QColor color = getBorderColor();
style = QStringLiteral("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();
style = QStringLiteral("QWidget#thumbnailWidget {"
" background-color: rgb(%1, %2, %3);"
" border-radius: 8px;"
"}")
.arg(color.red())
.arg(color.green())
.arg(color.blue());
pixmap = generateThumbnail(path);
}
_widget->setStyleSheet(style);
QPixmap scaledPixmap = pixmap.scaled(QSize(thumbnailSize, thumbnailSize),
Qt::KeepAspectRatio,
Qt::SmoothTransformation);
auto elided =
painter->fontMetrics().elidedText(baseName, Qt::TextElideMode::ElideRight, cardWidth);
auto name = std::make_unique<QLabel>(elided);
layout->addWidget(thumbnail.get()); // Temp. ownership transfer
layout->addWidget(name.get()); // Temp. ownership transfer
auto sizeLabel = std::make_unique<QLabel>(size);
layout->addWidget(sizeLabel.get()); // Temp. ownership transfer
layout->addStretch();
_widget->resize(option.rect.size());
painter->translate(option.rect.topLeft());
_widget->render(painter, QPoint(), QRegion(), QWidget::DrawChildren);
// Step 4: Positioning
QRect thumbnailRect(option.rect.x() + margin,
option.rect.y() + margin,
thumbnailSize,
thumbnailSize);
QRect textRect(option.rect.x() + margin,
thumbnailRect.bottom() + margin,
thumbnailSize,
painter->fontMetrics().lineSpacing());
QRect sizeRect(option.rect.x() + margin,
textRect.bottom() + textspacing,
thumbnailSize,
painter->fontMetrics().lineSpacing() + margin);
// Step 5: Draw
painter->drawPixmap(thumbnailRect, scaledPixmap);
painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, elidedName);
painter->drawText(sizeRect, Qt::AlignLeft | Qt::AlignTop, size);
painter->restore();
layout->removeWidget(sizeLabel.get());
layout->removeWidget(thumbnail.get());
layout->removeWidget(name.get());
}
QSize FileCardDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
{
Q_UNUSED(option)
Q_UNUSED(index)
Q_UNUSED(option);
Q_UNUSED(index);
auto thumbnailSize = _parameterGroup->GetInt("FileThumbnailIconsSize", 128); // NOLINT
auto cardMargin = _widget->layout()->contentsMargins();
auto cardWidth = thumbnailSize + cardMargin.left() + cardMargin.right();
auto spacing = _widget->layout()->spacing();
auto font = QGuiApplication::font();
auto qfm = QFontMetrics(font);
auto textHeight = 2 * qfm.lineSpacing();
auto cardHeight =
thumbnailSize + textHeight + 2 * spacing + cardMargin.top() + cardMargin.bottom();
QFontMetrics qfm(QGuiApplication::font());
int textHeight = textspacing + qfm.lineSpacing() * 2; // name + size
int cardWidth = static_cast<int>(thumbnailSize) + 2 * margin;
int cardHeight = static_cast<int>(thumbnailSize) + textHeight + 3 * margin;
return {static_cast<int>(cardWidth), static_cast<int>(cardHeight)};
return {cardWidth, cardHeight};
}
namespace

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

@@ -27,9 +27,9 @@
#include <Base/Parameter.h>
#include <QImage>
#include <QAbstractItemDelegate>
#include <QStyledItemDelegate>
class FileCardDelegate: public QAbstractItemDelegate
class FileCardDelegate: public QStyledItemDelegate
{
public:
@@ -44,14 +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;
std::unique_ptr<QWidget> _widget;
const int margin = 11;
const int textspacing = 2;
};

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

@@ -30,7 +30,6 @@
namespace StartGui
{
FileCardView::FileCardView(QWidget* parent)
: QListView(parent)
{
@@ -45,7 +44,12 @@ FileCardView::FileCardView(QWidget* parent)
setResizeMode(QListView::ResizeMode::Adjust);
setUniformItemSizes(true);
setMouseTracking(true);
setSpacing(20);
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Start");
m_cardSpacing = static_cast<int>(hGrp->GetInt("FileCardSpacing", 16)); // NOLINT
setSpacing(m_cardSpacing);
}
int FileCardView::heightForWidth(int width) const
@@ -61,28 +65,22 @@ int FileCardView::heightForWidth(int width) const
int numRows =
static_cast<int>(ceil(static_cast<double>(numCards) / static_cast<double>(cardsPerRow)));
int neededHeight = numRows * cardSize.height();
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Start");
int cardSpacing = static_cast<int>(hGrp->GetInt("FileCardSpacing", 20)); // NOLINT
return neededHeight + cardSpacing * (numRows - 1) + 2 * cardSpacing;
return neededHeight + m_cardSpacing * (numRows - 1) + 2 * m_cardSpacing;
}
QSize FileCardView::sizeHint() const
{
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Start");
int cardSpacing = static_cast<int>(hGrp->GetInt("FileCardSpacing", 20)); // NOLINT
auto model = this->model();
auto delegate = this->itemDelegate();
if (!model || !delegate) {
// The model and/or delegate have not been set yet, this was an early startup call
return {cardSpacing, cardSpacing};
return {m_cardSpacing, m_cardSpacing};
}
int numCards = model->rowCount();
auto cardSize = delegate->sizeHint(QStyleOptionViewItem(), model->index(0, 0));
return {(cardSize.width() + cardSpacing) * numCards + cardSpacing,
cardSize.height() + 2 * cardSpacing};
return {(cardSize.width() + m_cardSpacing) * numCards + m_cardSpacing,
cardSize.height() + 2 * m_cardSpacing};
}
} // namespace StartGui

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

@@ -39,6 +39,9 @@ public:
int heightForWidth(int width) const override;
QSize sizeHint() const override;
private:
int m_cardSpacing;
};
} // namespace StartGui

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

@@ -73,7 +73,7 @@ class NewFileButton: public QPushButton
{
public:
NewFileButton(const NewButton& newButton)
explicit NewFileButton(const NewButton& newButton)
{
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Start");
@@ -84,6 +84,7 @@ public:
static_cast<int>(hGrp->GetInt("FileCardLabelWith", 180)); // NOLINT
auto mainLayout = gsl::owner<QHBoxLayout*>(new QHBoxLayout(this));
mainLayout->setAlignment(Qt::AlignVCenter);
auto iconLabel = gsl::owner<QLabel*>(new QLabel(this));
mainLayout->addWidget(iconLabel);
QIcon baseIcon(newButton.iconPath);
@@ -93,7 +94,9 @@ public:
auto textLayout = gsl::owner<QVBoxLayout*>(new QVBoxLayout);
auto textLabelLine1 = gsl::owner<QLabel*>(new QLabel(this));
textLabelLine1->setText(newButton.heading);
textLabelLine1->setStyleSheet(QLatin1String("font-weight: bold;"));
QFont font = textLabelLine1->font();
font.setWeight(QFont::Bold);
textLabelLine1->setFont(font);
auto textLabelLine2 = gsl::owner<QLabel*>(new QLabel(this));
textLabelLine2->setText(newButton.description);
textLabelLine2->setWordWrap(true);
@@ -104,77 +107,17 @@ public:
mainLayout->addStretch();
this->setMinimumHeight(newFileIconSize + cardSpacing);
this->setMinimumWidth(newFileIconSize + cardLabelWith);
textLabelLine1->adjustSize();
textLabelLine2->adjustSize();
int textHeight =
textLabelLine1->height() + textLabelLine2->height() + textLayout->spacing();
updateStyle();
int minWidth = newFileIconSize + cardLabelWith + cardSpacing;
int minHeight = std::max(newFileIconSize, textHeight) + cardSpacing;
this->setMinimumHeight(minHeight);
this->setMinimumWidth(minWidth);
}
void updateStyle()
{
QString style = QStringLiteral("");
if (qApp->styleSheet().isEmpty()) {
style = fileCardStyle();
}
setStyleSheet(style); // This will trigger a changeEvent
}
void changeEvent(QEvent* event) override
{
if (!changeInProgress && event->type() == QEvent::StyleChange) {
changeInProgress = true; // Block recursive calls.
updateStyle();
changeInProgress = false;
}
QPushButton::changeEvent(event);
}
QString fileCardStyle() const
{
auto hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Start");
auto getUserColor = [&hGrp](QColor color, const char* parameter) {
uint32_t packed = Base::Color::asPackedRGB<QColor>(color);
packed = hGrp->GetUnsigned(parameter, packed);
color = Base::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 QStringLiteral("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());
}
private:
bool changeInProgress = false;
};
} // namespace