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

removing fixed size from mic/volume buttons so they align nicely

This commit is contained in:
agilob 2014-12-17 12:36:34 +01:00
parent f8d870f374
commit 5861c6daa5
No known key found for this signature in database
GPG Key ID: 34568050DBCCB997
5 changed files with 18 additions and 16 deletions

View File

@ -52,10 +52,13 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
nameLabel->setEditable(true);
avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
QHBoxLayout *headLayout = new QHBoxLayout(), *mainFootLayout = new QHBoxLayout();
headTextLayout = new QVBoxLayout();
QVBoxLayout *mainLayout = new QVBoxLayout();
QVBoxLayout *footButtonsSmall = new QVBoxLayout(), *volMicLayout = new QVBoxLayout();
QHBoxLayout *headLayout = new QHBoxLayout(),
*mainFootLayout = new QHBoxLayout();
QVBoxLayout *mainLayout = new QVBoxLayout(),
*footButtonsSmall = new QVBoxLayout(),
*volMicLayout = new QVBoxLayout();
headTextLayout = new QVBoxLayout();
chatWidget = new ChatAreaWidget();
@ -76,10 +79,10 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
videoButton->setFixedSize(50,40);
videoButton->setToolTip(tr("Video call: RED means you're on a call"));
volButton = new QPushButton();
volButton->setFixedSize(25,20);
//volButton->setFixedSize(25,20);
volButton->setToolTip(tr("Toggle speakers volume: RED is OFF"));
micButton = new QPushButton();
micButton->setFixedSize(25,20);
// micButton->setFixedSize(25,20);
micButton->setToolTip(tr("Toggle microphone: RED is OFF"));
footButtonsSmall->setSpacing(2);
@ -119,6 +122,13 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
mainFootLayout->addSpacing(5);
mainFootLayout->addWidget(sendButton);
mainFootLayout->setSpacing(0);
headTextLayout->addStretch();
headTextLayout->addWidget(nameLabel);
volMicLayout->addWidget(micButton, Qt::AlignTop);
volMicLayout->addSpacing(2);
volMicLayout->addWidget(volButton, Qt::AlignBottom);
headWidget->setLayout(headLayout);
headLayout->addWidget(avatar);
@ -130,14 +140,6 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
headLayout->addWidget(videoButton);
headLayout->setSpacing(0);
volMicLayout->addStretch();
volMicLayout->addWidget(micButton);
volMicLayout->addWidget(volButton);
volMicLayout->addStretch();
headTextLayout->addStretch();
headTextLayout->addWidget(nameLabel);
//Fix for incorrect layouts on OS X as per
//https://bugreports.qt-project.org/browse/QTBUG-14591
sendButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);

View File

@ -5,7 +5,7 @@ QPushButton#green
background-repeat: none;
border: none;
width: 25px;
height: 20px;
height: 18px;
}
QPushButton#green:hover
@ -20,7 +20,7 @@ QPushButton#red
background-repeat: none;
border: none;
width: 25px;
height: 20px;
height: 18px;
}
QPushButton:focus {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 637 B

After

Width:  |  Height:  |  Size: 624 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 597 B

After

Width:  |  Height:  |  Size: 590 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 629 B

After

Width:  |  Height:  |  Size: 617 B