diff --git a/kde/src/CallView.cpp b/kde/src/CallView.cpp index 2f753e4a2326b1d86b5d3ec0227df44f8f22ad86..7211f1fbf77b70aca56df6ca8948883276abb164 100644 --- a/kde/src/CallView.cpp +++ b/kde/src/CallView.cpp @@ -648,10 +648,11 @@ bool CallView::conferenceChanged(Call* conf) kDebug() << "Call " << callId << " does not exist"; } - for (int j =0; j < SFLPhone::model()->getIndex(conf)->childCount();j++) { - if (buffer.indexOf(SFLPhone::model()->getIndex(conf)->child(j)) == -1) - insertItem(extractItem(SFLPhone::model()->getIndex(conf)->child(j))); - } + if (SFLPhone::model()->getIndex(conf)) /*Can happen is the daemon crashed*/ + for (int j =0; j < SFLPhone::model()->getIndex(conf)->childCount();j++) { + if (buffer.indexOf(SFLPhone::model()->getIndex(conf)->child(j)) == -1) + insertItem(extractItem(SFLPhone::model()->getIndex(conf)->child(j))); + } Q_ASSERT_X(SFLPhone::model()->getIndex(conf)->childCount() == 0,"changind conference","A conference can't have no participants"); diff --git a/kde/src/widgets/CallTreeItem.cpp b/kde/src/widgets/CallTreeItem.cpp index b2c12730ce0c43053800f6fe22756021dcb068ae..336b3a95a01d6fa85ef2faa47f078417957a9488 100644 --- a/kde/src/widgets/CallTreeItem.cpp +++ b/kde/src/widgets/CallTreeItem.cpp @@ -278,6 +278,7 @@ void CallTreeItem::dropEvent(QDropEvent *e) { kDebug() << "Drop accepted" << e->pos(); QTimer::singleShot(500, this, SLOT(hide())); + m_isHover = false; if (e->pos().x() < rect().width()/2) { emit conversationDropEvent(m_pItemCall,(QMimeData*)e->mimeData()); } @@ -291,11 +292,12 @@ void CallTreeItem::resizeEvent ( QResizeEvent *e ) { kDebug() << "Resize"; if (m_pBtnConf) { - m_pBtnConf->setMinimumSize(width()/2-5,height()); - m_pBtnConf->setMaximumSize(width()/2-5,height()); - m_pBtnTrans->setMinimumSize(width()/2-5,height()); - m_pBtnTrans->setMaximumSize(width()/2-5,height()); - m_pBtnTrans->move(width()/2+10,m_pBtnTrans->y()); + m_pBtnConf->setMinimumSize(width()/2-15,height()-4); + m_pBtnConf->setMaximumSize(width()/2-15,height()-4); + m_pBtnTrans->setMinimumSize(width()/2-15,height()-4); + m_pBtnTrans->setMaximumSize(width()/2-15,height()-4); + m_pBtnTrans->move(width()/2+10,m_pBtnTrans->y()+2); + m_pBtnConf->move(10,m_pBtnConf->y()+2); } e->accept(); diff --git a/kde/src/widgets/TranslucentButtons.cpp b/kde/src/widgets/TranslucentButtons.cpp index 0245e00607dff24aa13deff4e174a2f9d515fbab..0529f82d46223378e30fdac4afbc2faa8c876ea2 100644 --- a/kde/src/widgets/TranslucentButtons.cpp +++ b/kde/src/widgets/TranslucentButtons.cpp @@ -61,6 +61,7 @@ void TranslucentButtons::setVisible(bool enabled) m_CurrentColor.setAlpha(0); repaint(); m_pTimer->start(10); + raise(); } m_enabled = enabled; QWidget::setVisible(enabled);