1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'fix-hline-864'

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

View File

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

View File

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