Skip to content
Snippets Groups Projects
Commit 33b1bf4f authored by Emmanuel Lepage's avatar Emmanuel Lepage
Browse files

[ #7901 ] Cosmetic and bug fixes

parent 539cf303
No related branches found
No related tags found
No related merge requests found
...@@ -648,6 +648,7 @@ bool CallView::conferenceChanged(Call* conf) ...@@ -648,6 +648,7 @@ bool CallView::conferenceChanged(Call* conf)
kDebug() << "Call " << callId << " does not exist"; kDebug() << "Call " << callId << " does not exist";
} }
if (SFLPhone::model()->getIndex(conf)) /*Can happen is the daemon crashed*/
for (int j =0; j < SFLPhone::model()->getIndex(conf)->childCount();j++) { for (int j =0; j < SFLPhone::model()->getIndex(conf)->childCount();j++) {
if (buffer.indexOf(SFLPhone::model()->getIndex(conf)->child(j)) == -1) if (buffer.indexOf(SFLPhone::model()->getIndex(conf)->child(j)) == -1)
insertItem(extractItem(SFLPhone::model()->getIndex(conf)->child(j))); insertItem(extractItem(SFLPhone::model()->getIndex(conf)->child(j)));
......
...@@ -278,6 +278,7 @@ void CallTreeItem::dropEvent(QDropEvent *e) ...@@ -278,6 +278,7 @@ void CallTreeItem::dropEvent(QDropEvent *e)
{ {
kDebug() << "Drop accepted" << e->pos(); kDebug() << "Drop accepted" << e->pos();
QTimer::singleShot(500, this, SLOT(hide())); QTimer::singleShot(500, this, SLOT(hide()));
m_isHover = false;
if (e->pos().x() < rect().width()/2) { if (e->pos().x() < rect().width()/2) {
emit conversationDropEvent(m_pItemCall,(QMimeData*)e->mimeData()); emit conversationDropEvent(m_pItemCall,(QMimeData*)e->mimeData());
} }
...@@ -291,11 +292,12 @@ void CallTreeItem::resizeEvent ( QResizeEvent *e ) ...@@ -291,11 +292,12 @@ void CallTreeItem::resizeEvent ( QResizeEvent *e )
{ {
kDebug() << "Resize"; kDebug() << "Resize";
if (m_pBtnConf) { if (m_pBtnConf) {
m_pBtnConf->setMinimumSize(width()/2-5,height()); m_pBtnConf->setMinimumSize(width()/2-15,height()-4);
m_pBtnConf->setMaximumSize(width()/2-5,height()); m_pBtnConf->setMaximumSize(width()/2-15,height()-4);
m_pBtnTrans->setMinimumSize(width()/2-5,height()); m_pBtnTrans->setMinimumSize(width()/2-15,height()-4);
m_pBtnTrans->setMaximumSize(width()/2-5,height()); m_pBtnTrans->setMaximumSize(width()/2-15,height()-4);
m_pBtnTrans->move(width()/2+10,m_pBtnTrans->y()); m_pBtnTrans->move(width()/2+10,m_pBtnTrans->y()+2);
m_pBtnConf->move(10,m_pBtnConf->y()+2);
} }
e->accept(); e->accept();
......
...@@ -61,6 +61,7 @@ void TranslucentButtons::setVisible(bool enabled) ...@@ -61,6 +61,7 @@ void TranslucentButtons::setVisible(bool enabled)
m_CurrentColor.setAlpha(0); m_CurrentColor.setAlpha(0);
repaint(); repaint();
m_pTimer->start(10); m_pTimer->start(10);
raise();
} }
m_enabled = enabled; m_enabled = enabled;
QWidget::setVisible(enabled); QWidget::setVisible(enabled);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment