Commit 57227777 authored by Alexandre Lision's avatar Alexandre Lision

call: fix selection

animation was not triggered when making a new call or receiving one

Change-Id: I2b7725a1ce92e972dbf59204ee4717b5a33cfee9
Tuleap: #202
parent d7bf288c
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
[personLabel setStringValue:callIdx.data(Qt::DisplayRole).toString().toNSString()]; [personLabel setStringValue:callIdx.data(Qt::DisplayRole).toString().toNSString()];
[timeSpentLabel setStringValue:callIdx.data((int)Call::Role::Length).toString().toNSString()]; [timeSpentLabel setStringValue:callIdx.data((int)Call::Role::Length).toString().toNSString()];
[stateLabel setStringValue:callIdx.data((int)Call::Role::HumanStateName).toString().toNSString()];
auto contactmethod = qvariant_cast<Call*>(callIdx.data(static_cast<int>(Call::Role::Object)))->peerContactMethod(); auto contactmethod = qvariant_cast<Call*>(callIdx.data(static_cast<int>(Call::Role::Object)))->peerContactMethod();
BOOL shouldShow = (!contactmethod->contact() || contactmethod->contact()->isPlaceHolder()); BOOL shouldShow = (!contactmethod->contact() || contactmethod->contact()->isPlaceHolder());
...@@ -152,7 +153,6 @@ ...@@ -152,7 +153,6 @@
[self.controlsPanel setHidden:current->hasParentCall()]; [self.controlsPanel setHidden:current->hasParentCall()];
[self.joinPanel setHidden:!current->hasParentCall()]; [self.joinPanel setHidden:!current->hasParentCall()];
[stateLabel setStringValue:callIdx.data((int)Call::Role::HumanStateName).toString().toNSString()];
switch (state) { switch (state) {
case Call::State::DIALING: case Call::State::DIALING:
[loadingIndicator setHidden:NO]; [loadingIndicator setHidden:NO];
...@@ -273,7 +273,16 @@ ...@@ -273,7 +273,16 @@
QObject::connect(&CallModel::instance(), QObject::connect(&CallModel::instance(),
&CallModel::callStateChanged, &CallModel::callStateChanged,
[self](Call* c, Call::State state) { [self](Call* c, Call::State state) {
[self updateCall]; auto current = CallModel::instance().selectionModel()->currentIndex();
if (!current.isValid())
[self animateOut];
else if (CallModel::instance().getIndex(c) == current) {
if (c->state() == Call::State::OVER) {
[self animateOut];
} else {
[self updateCall];
}
}
}); });
} }
...@@ -485,6 +494,11 @@ ...@@ -485,6 +494,11 @@
[self.chatButton setState:NSOffState]; [self.chatButton setState:NSOffState];
[self.mergeCallsButton setState:NSOffState]; [self.mergeCallsButton setState:NSOffState];
[self collapseRightView]; [self collapseRightView];
[personLabel setStringValue:@""];
[timeSpentLabel setStringValue:@""];
[stateLabel setStringValue:@""];
[self.addContactButton setHidden:YES];
} }
-(void) animateOut -(void) animateOut
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment