From 11de9a2dba183ebbdcbf37937dff2e5d62837364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Wed, 18 Mar 2020 00:50:50 +0100
Subject: [PATCH] Sticky App bar for fullscreen

---
 app/src/components/VideoContainers/FullScreenView.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/components/VideoContainers/FullScreenView.js b/app/src/components/VideoContainers/FullScreenView.js
index c7854ef..7516f1b 100644
--- a/app/src/components/VideoContainers/FullScreenView.js
+++ b/app/src/components/VideoContainers/FullScreenView.js
@@ -83,6 +83,7 @@ const FullScreenView = (props) =>
 		consumer,
 		toggleConsumerFullscreen,
 		toolbarsVisible,
+		stickyAppBar,
 		classes
 	} = props;
 
@@ -105,7 +106,7 @@ const FullScreenView = (props) =>
 			<div className={classes.controls}>
 				<div
 					className={classnames(classes.button, {
-						visible : toolbarsVisible
+						visible : toolbarsVisible || stickyAppBar
 					})}
 					onClick={(e) =>
 					{
@@ -134,13 +135,15 @@ FullScreenView.propTypes =
 	consumer                 : appPropTypes.Consumer,
 	toggleConsumerFullscreen : PropTypes.func.isRequired,
 	toolbarsVisible          : PropTypes.bool,
+	stickyAppBar             : PropTypes.bool,
 	classes                  : PropTypes.object.isRequired
 };
 
 const mapStateToProps = (state) =>
 	({
 		consumer        : state.consumers[state.room.fullScreenConsumer],
-		toolbarsVisible : state.room.toolbarsVisible
+		toolbarsVisible : state.room.toolbarsVisible,
+		stickyAppBar    : state.settings.stickyAppBar
 	});
 
 const mapDispatchToProps = (dispatch) =>
@@ -162,7 +165,8 @@ export default connect(
 			return (
 				prev.consumers[prev.room.fullScreenConsumer] ===
 					next.consumers[next.room.fullScreenConsumer] &&
-				prev.room.toolbarsVisible === next.room.toolbarsVisible
+				prev.room.toolbarsVisible === next.room.toolbarsVisible &&
+				prev.settings.stickyAppBar === next.settings.stickyAppBar
 			);
 		}
 	}