From 3f433f1176445c2c1a93d140f229842bfa3a914c Mon Sep 17 00:00:00 2001 From: "Tux3 / Mlkj / !Lev.uXFMLA" Date: Sun, 25 Jan 2015 17:18:20 +0100 Subject: [PATCH] Pixel-perfect spacing of chat form buttons --- src/widget/form/genericchatform.cpp | 7 +++++-- ui/micButton/micButton.css | 12 ++++++------ ui/volButton/volButton.css | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp index 799558775..49c68c04d 100644 --- a/src/widget/form/genericchatform.cpp +++ b/src/widget/form/genericchatform.cpp @@ -130,13 +130,16 @@ GenericChatForm::GenericChatForm(QWidget *parent) : headTextLayout->addWidget(nameLabel); headTextLayout->addStretch(); + micButtonsLayout->setSpacing(0); micButtonsLayout->addWidget(micButton, Qt::AlignTop | Qt::AlignRight); + micButtonsLayout->addSpacing(4); micButtonsLayout->addWidget(volButton, Qt::AlignTop | Qt::AlignRight); - buttonsLayout->addLayout(micButtonsLayout, 0, 0, Qt::AlignTop | Qt::AlignRight); + buttonsLayout->addLayout(micButtonsLayout, 0, 0, 2, 1, Qt::AlignTop | Qt::AlignRight); buttonsLayout->addWidget(callButton, 0, 1, 2, 1, Qt::AlignTop); buttonsLayout->addWidget(videoButton, 0, 2, 2, 1, Qt::AlignTop); - buttonsLayout->setSpacing(1); + buttonsLayout->setVerticalSpacing(0); + buttonsLayout->setHorizontalSpacing(4); headLayout->addWidget(avatar, Qt::AlignTop | Qt::AlignLeft); headLayout->addSpacing(5); diff --git a/ui/micButton/micButton.css b/ui/micButton/micButton.css index ec784ae7a..df03739ee 100644 --- a/ui/micButton/micButton.css +++ b/ui/micButton/micButton.css @@ -4,8 +4,8 @@ QPushButton#green background-image: url(":/ui/micButton/micButton.png"); background-repeat: none; border: none; - width: 25px; - height: 20px; + width: 22px; + height: 18px; } QPushButton#green:hover @@ -19,8 +19,8 @@ QPushButton#red background-image: url(":/ui/micButton/micButtonPressed.png"); background-repeat: none; border: none; - width: 25px; - height: 20px; + width: 22px; + height: 18px; } QPushButton#grey @@ -29,8 +29,8 @@ QPushButton#grey background-image: url(":/ui/micButton/micButtonDisabled.png"); background-repeat: none; border: none; - width: 25px; - height: 20px; + width: 22px; + height: 18px; } QPushButton:focus { diff --git a/ui/volButton/volButton.css b/ui/volButton/volButton.css index 8210f4819..0ddeabc19 100644 --- a/ui/volButton/volButton.css +++ b/ui/volButton/volButton.css @@ -4,7 +4,7 @@ QPushButton#green background-image: url(":/ui/volButton/volButton.png"); background-repeat: none; border: none; - width: 25px; + width: 22px; height: 18px; } @@ -19,7 +19,7 @@ QPushButton#red background-image: url(":/ui/volButton/volButtonPressed.png"); background-repeat: none; border: none; - width: 25px; + width: 22px; height: 18px; }