Merge pull request #641 from matrix-org/luke/fix-statusbar-hidden

Expand timeline in situations when _getIndicator not null
2017-01-24 14:43:46 +00:00
parent c0de0870ed ce7434984b
commit 91a052f817
1 changed files with 5 additions and 1 deletions
@@ -135,7 +135,11 @@ module.exports = React.createClass({
    // changed - so we use '0' to indicate normal size, and other values to
    // indicate other sizes.
    _getSize: function(state, props) {
-        if (state.syncState === "ERROR" || state.whoisTypingString) {
+        if (state.syncState === "ERROR" ||
+            state.whoisTypingString ||
+            props.numUnreadMessages ||
+            !props.atEndOfLiveTimeline ||
+            props.hasActiveCall) {
            return STATUS_BAR_EXPANDED;
        } else if (props.tabCompleteEntries) {
            return STATUS_BAR_HIDDEN;