spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2025-09-23 19:42:21 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

添加界面组件间的分隔线方便识别

Browse Source 
顺便增加了DVL（DivideLine）色
This commit is contained in:
RigoLigoRLC 2022-02-16 00:57:55 +08:00
parent 55795601e0
commit c71582997b
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/spkmainwindow.cpp
View File

@ -18,6 +18,8 @@ SpkMainWindow::SpkMainWindow(QWidget *parent) : SpkWindow(parent)
GetTitleBar()->SetTitle(""); GetTitleBar()->SetTitle("");
GetTitleBar()->SetUseIcon(true); GetTitleBar()->SetUseIcon(true);
GetTitleBar()->SetIcon(QIcon(":/icons/spark-store.svg").pixmap({ 40, 40 })); GetTitleBar()->SetIcon(QIcon(":/icons/spark-store.svg").pixmap({ 40, 40 }));
GetTitleBar()->setObjectName("spk_mw_titlebar");
GetTitleBar()->setAttribute(Qt::WA_StyledBackground);
auto size = QGuiApplication::primaryScreen()->size() * 0.5; auto size = QGuiApplication::primaryScreen()->size() * 0.5;
size = size.expandedTo(QSize(900, 600)); size = size.expandedTo(QSize(900, 600));
@ -416,7 +418,7 @@ SpkUi::SpkMainWidget::SpkMainWidget(QWidget *parent) : QFrame(parent)
CategoryWidget->setColumnCount(1); CategoryWidget->setColumnCount(1);
CategoryWidget->setHeaderHidden(true); CategoryWidget->setHeaderHidden(true);
CategoryWidget->setSelectionMode(QAbstractItemView::SelectionMode::SingleSelection); CategoryWidget->setSelectionMode(QAbstractItemView::SelectionMode::SingleSelection);
CategoryWidget->setFixedWidth(250); CategoryWidget->setFixedWidth(200);
//============ Sidebar entries BEGIN ============ //============ Sidebar entries BEGIN ============
HomepageItem = new QTreeWidgetItem(QStringList(tr("Home"))); HomepageItem = new QTreeWidgetItem(QStringList(tr("Home")));

3
gui/spkqsshelper.cpp
View File

@ -33,6 +33,7 @@ const std::map<SpkUi::Qss::ColorSetIndex, const char *> SpkUi::Qss::ColorSet2Tok
{ ShadesEdge, "SHD" }, { ShadesEdge, "SHD" },
{ ScrollBarNorm, "SCBN" }, { ScrollBarNorm, "SCBN" },
{ ScrollBarHover, "SCBH" }, { ScrollBarHover, "SCBH" },
{ DivideLine, "DVL" },
}; };
const std::map<SpkUi::Qss::ColorSetIndex, QColor> SpkUi::Qss::DarkColorSet const std::map<SpkUi::Qss::ColorSetIndex, QColor> SpkUi::Qss::DarkColorSet
@ -60,6 +61,7 @@ const std::map<SpkUi::Qss::ColorSetIndex, QColor> SpkUi::Qss::DarkColorSet
{ ShadesEdge, 0x7b7b7b }, { ShadesEdge, 0x7b7b7b },
{ ScrollBarNorm, 0x404040 }, { ScrollBarNorm, 0x404040 },
{ ScrollBarHover, 0x656565 }, { ScrollBarHover, 0x656565 },
{ DivideLine, 0x424242 },
}; };
const std::map<SpkUi::Qss::ColorSetIndex, QColor> SpkUi::Qss::LightColorSet const std::map<SpkUi::Qss::ColorSetIndex, QColor> SpkUi::Qss::LightColorSet
@ -87,4 +89,5 @@ const std::map<SpkUi::Qss::ColorSetIndex, QColor> SpkUi::Qss::LightColorSet
{ ShadesEdge, 0xc5c5c5 }, { ShadesEdge, 0xc5c5c5 },
{ ScrollBarNorm, 0xa0a0a0 }, { ScrollBarNorm, 0xa0a0a0 },
{ ScrollBarHover, 0x858585 }, { ScrollBarHover, 0x858585 },
{ DivideLine, 0xd5d5d5 },
}; };

4
gui/spktitlebar.cpp
View File

@ -5,7 +5,7 @@
#include "spkui_general.h" #include "spkui_general.h"
#include "spktitlebar.h" #include "spktitlebar.h"
SpkTitleBar::SpkTitleBar(QWidget *parent) : QWidget(parent) SpkTitleBar::SpkTitleBar(QWidget *parent) : QFrame(parent)
{ {
mLinkedWindow = nullptr; mLinkedWindow = nullptr;
@ -39,7 +39,7 @@ SpkTitleBar::SpkTitleBar(QWidget *parent) : QWidget(parent)
mBtnMaxRestore->SetRole(OperationButton::MaximizeRestore); mBtnMaxRestore->SetRole(OperationButton::MaximizeRestore);
mBtnClose->SetRole(OperationButton::Close); mBtnClose->SetRole(OperationButton::Close);
mMainLayout->setContentsMargins(0, 0, 0, 0); mMainLayout->setContentsMargins(0, 0, 0, 1);
setLayout(mMainLayout); setLayout(mMainLayout);

1
inc/spkqsshelper.h
View File

@ -36,6 +36,7 @@ namespace SpkUi
ShadesEdge, ShadesEdge,
ScrollBarNorm, ScrollBarNorm,
ScrollBarHover, ScrollBarHover,
DivideLine,
}; };
extern const std::list<ColorSetIndex> AccentColorExceptions; extern const std::list<ColorSetIndex> AccentColorExceptions;

2
inc/spktitlebar.h
View File

@ -36,7 +36,7 @@ class SpkTitleBarDefaultButton : public QPushButton
void PaintSymbol(QPainter &); void PaintSymbol(QPainter &);
}; };
class SpkTitleBar : public QWidget class SpkTitleBar : public QFrame
{ {
Q_OBJECT Q_OBJECT
friend class SpkWindow; friend class SpkWindow;

9
resource/stylesheets/default.css
View File

@ -197,7 +197,7 @@ QMenu::item:pressed
QMenu::separator QMenu::separator
{ {
background: DCTLD; background: DVL;
height: 1px; height: 1px;
margin: 2px; margin: 2px;
margin-left: 8px; margin-left: 8px;
@ -356,6 +356,7 @@ SpkTitleBarDefaultButton:pressed
border: none; border: none;
font-size: 14px; font-size: 14px;
show-decoration-selected: 1; show-decoration-selected: 1;
border-right: 1px solid DVL;
} }
#styMwCateg::item #styMwCateg::item
@ -380,3 +381,9 @@ SpkTitleBarDefaultButton:pressed
{ {
background-color: ACC_; background-color: ACC_;
} }
#spk_mw_titlebar
{
background-color: GBG_;
border-bottom: 1px solid DVL;
}