diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp index 4f3572409..30dadae74 100644 --- a/src/widget/form/genericchatform.cpp +++ b/src/widget/form/genericchatform.cpp @@ -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); diff --git a/ui/volButton/volButton.css b/ui/volButton/volButton.css index 3bf4d64a8..8210f4819 100644 --- a/ui/volButton/volButton.css +++ b/ui/volButton/volButton.css @@ -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 { diff --git a/ui/volButton/volButton.png b/ui/volButton/volButton.png index a1c474eab..b07c13209 100644 Binary files a/ui/volButton/volButton.png and b/ui/volButton/volButton.png differ diff --git a/ui/volButton/volButtonHover.png b/ui/volButton/volButtonHover.png index 82c126c8f..4a5e47d97 100644 Binary files a/ui/volButton/volButtonHover.png and b/ui/volButton/volButtonHover.png differ diff --git a/ui/volButton/volButtonPressed.png b/ui/volButton/volButtonPressed.png index e0078285e..c2379c1c9 100644 Binary files a/ui/volButton/volButtonPressed.png and b/ui/volButton/volButtonPressed.png differ