Browse Source

Merge pull request #192 from krepa098/master

Fixes (0deref, misc)
pull/195/head
Tux3 / Mlkj / !Lev.uXFMLA 11 years ago
parent
commit
2727e7ba1f
  1. 2
      widget/croppinglabel.cpp
  2. 2
      widget/friendwidget.cpp
  3. 4
      widget/friendwidget.h
  4. 2
      widget/widget.cpp

2
widget/croppinglabel.cpp

@ -24,7 +24,7 @@ CroppingLabel::CroppingLabel(QWidget* parent) @@ -24,7 +24,7 @@ CroppingLabel::CroppingLabel(QWidget* parent)
void CroppingLabel::setText(const QString& text)
{
origText = text;
origText = text.trimmed();
setElidedText();
}

2
widget/friendwidget.cpp

@ -53,8 +53,6 @@ FriendWidget::FriendWidget(int FriendId, QString id) @@ -53,8 +53,6 @@ FriendWidget::FriendWidget(int FriendId, QString id)
pal3.setColor(QPalette::Background, QColor(65,65,65,255));
this->setPalette(pal3);
name.setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
textLayout.addStretch();
textLayout.addWidget(&name);
textLayout.addWidget(&statusMessage);

4
widget/friendwidget.h

@ -44,8 +44,8 @@ signals: @@ -44,8 +44,8 @@ signals:
public:
int friendId;
QLabel avatar, name, statusPic;
CroppingLabel statusMessage;
QLabel avatar, statusPic;
CroppingLabel name, statusMessage;
QHBoxLayout layout;
QVBoxLayout textLayout;

2
widget/widget.cpp

@ -616,7 +616,7 @@ void Widget::onGroupMessageReceived(int groupnumber, int friendgroupnumber, cons @@ -616,7 +616,7 @@ void Widget::onGroupMessageReceived(int groupnumber, int friendgroupnumber, cons
g->chatForm->addGroupMessage(message, friendgroupnumber);
if ((isGroupWidgetActive != 1 || (g->groupId != activeGroupWidget->groupId)) || isWindowMinimized || !isActiveWindow())
if ((isGroupWidgetActive != 1 || (activeGroupWidget && g->groupId != activeGroupWidget->groupId)) || isWindowMinimized || !isActiveWindow())
{
if (message.contains(core->getUsername(), Qt::CaseInsensitive))
{

Loading…
Cancel
Save