From 33b1bf4fe82cd24262bd6d54e3c2924041495bb4 Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
Date: Fri, 16 Dec 2011 17:29:05 -0500
Subject: [PATCH] [ #7901 ] Cosmetic and bug fixes
---
kde/src/CallView.cpp | 9 +++++----
kde/src/widgets/CallTreeItem.cpp | 12 +++++++-----
kde/src/widgets/TranslucentButtons.cpp | 1 +
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/kde/src/CallView.cpp b/kde/src/CallView.cpp
index 2f753e4a23..7211f1fbf7 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 b2c12730ce..336b3a95a0 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 0245e00607..0529f82d46 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);
--
GitLab