StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-hline-864'

Browse Source
This commit is contained in:
tux3 2016-01-21 05:36:52 +01:00
commit 48210e0372
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/widget/contentlayout.cpp
View File

@ -96,13 +96,12 @@ void ContentLayout::init()
mainHead->layout()->setSpacing(0); mainHead->layout()->setSpacing(0);
mainHead->setMouseTracking(true); mainHead->setMouseTracking(true);
mainHLine = new QFrame(); mainHLine.setFrameShape(QFrame::HLine);
mainHLine->setFrameShape(QFrame::HLine); mainHLine.setFrameShadow(QFrame::Plain);
mainHLine->setFrameShadow(QFrame::Plain); QPalette palette = mainHLine.palette();
QPalette palette = mainHLine->palette();
palette.setBrush(QPalette::WindowText, QBrush(QColor(193, 193, 193))); palette.setBrush(QPalette::WindowText, QBrush(QColor(193, 193, 193)));
palette.setBrush(QPalette::WindowText, QBrush(QColor(193, 193, 193))); palette.setBrush(QPalette::WindowText, QBrush(QColor(193, 193, 193)));
mainHLine->setPalette(palette); mainHLine.setPalette(palette);
mainContent = new QWidget(); mainContent = new QWidget();
mainContent->setLayout(new QVBoxLayout); mainContent->setLayout(new QVBoxLayout);
@ -120,7 +119,10 @@ void ContentLayout::init()
mainContent->setStyleSheet(Style::getStylesheet(":ui/settings/mainContent.css")); mainContent->setStyleSheet(Style::getStylesheet(":ui/settings/mainContent.css"));
#endif #endif
mainHLineLayout.addWidget(&mainHLine);
mainHLineLayout.addSpacing(5);
addWidget(mainHead); addWidget(mainHead);
addWidget(mainHLine); addLayout(&mainHLineLayout);
addWidget(mainContent); addWidget(mainContent);
} }

6
src/widget/contentlayout.h
View File

@ -21,8 +21,7 @@
#define CONTENTLAYOUT_H #define CONTENTLAYOUT_H
#include <QBoxLayout> #include <QBoxLayout>
#include <QFrame>
class QFrame;
class ContentLayout : public QVBoxLayout class ContentLayout : public QVBoxLayout
{ {
@ -33,8 +32,9 @@ public:
void clear(); void clear();
QFrame mainHLine;
QHBoxLayout mainHLineLayout;
QWidget* mainContent; QWidget* mainContent;
QFrame* mainHLine;
QWidget* mainHead; QWidget* mainHead;
private: private: