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

Fix bugs from pull #2

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-06-27 02:26:30 +02:00
parent 4af09eebf6
commit c7f22707f6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
widget/form/chatform.cpp
View File

@ -60,8 +60,8 @@ ChatForm::ChatForm(Friend* chatFriend)
callButton->setFlat(true);
callButton->setPalette(toxgreen);
callButton->setAutoFillBackground(true);
callButton->setIconSize(QSize(32,32));
callButton->setFixedSize(50,50);
callButton->setIconSize(QSize(25,25));
callButton->setFixedSize(50,40);
main->setLayout(mainLayout);
mainLayout->addWidget(chatArea);
@ -73,7 +73,9 @@ ChatForm::ChatForm(Friend* chatFriend)
mainFootLayout->addWidget(msgEdit);
mainFootLayout->addLayout(footButtonsSmall);
mainFootLayout->addSpacing(5);
mainFootLayout->addWidget(sendButton);
mainFootLayout->setSpacing(0);
head->setLayout(headLayout);
headLayout->addWidget(avatar);

6
widget/widget.cpp
View File

@ -15,8 +15,7 @@
Widget *Widget::instance{nullptr};
Widget::Widget(QWidget *parent) :
QWidget(parent),
ui(new Ui::Widget)
QWidget(parent), ui(new Ui::Widget), activeFriendWidget{nullptr}
{
ui->setupUi(this);
ui->mainContent->setLayout(new QVBoxLayout());
@ -174,6 +173,7 @@ void Widget::hideMainForms()
item->widget()->hide();
while ((item = ui->mainContent->layout()->takeAt(0)) != 0)
item->widget()->hide();
activeFriendWidget->setAsInactiveFriend();
}
void Widget::onUsernameChanged(const QString& newUsername)
@ -296,7 +296,7 @@ void Widget::onFriendUsernameLoaded(int friendId, const QString& username)
void Widget::onFriendWidgetClicked(FriendWidget *widget)
{
if (activeFriendWidget != 0)
if (activeFriendWidget != nullptr)
{
activeFriendWidget->setAsInactiveFriend();
}