From 02b6c617c5957c2c044ddc19cedff886fd07c7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Thu, 7 May 2020 15:15:44 +0200
Subject: [PATCH] Respect hide media buttons setting on button control bar, ref
 #309

---
 app/public/config/config.example.js             |  2 ++
 app/src/components/Controls/ButtonControlBar.js | 10 +++++++++-
 app/src/components/Room.js                      |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/public/config/config.example.js b/app/public/config/config.example.js
index 38334f3..4bbc13f 100644
--- a/app/public/config/config.example.js
+++ b/app/public/config/config.example.js
@@ -57,6 +57,8 @@ var config =
 	// If true, will show media control buttons in separate
 	// control bar, not in the ME container.
 	buttonControlBar : false,
+	// Timeout for autohiding topbar and button control bar
+	hideTimeout      : 3000,
 	lastN            : 4,
 	mobileLastN      : 1,
 	// Highest number of speakers user can select
diff --git a/app/src/components/Controls/ButtonControlBar.js b/app/src/components/Controls/ButtonControlBar.js
index a70c43e..2ee5b7e 100644
--- a/app/src/components/Controls/ButtonControlBar.js
+++ b/app/src/components/Controls/ButtonControlBar.js
@@ -60,6 +60,7 @@ const ButtonControlBar = (props) =>
 	const {
 		roomClient,
 		toolbarsVisible,
+		hiddenControls,
 		me,
 		micProducer,
 		webcamProducer,
@@ -133,7 +134,11 @@ const ButtonControlBar = (props) =>
 	return (
 		<div
 			className={
-				classnames(classes.root, toolbarsVisible ? classes.show : classes.hide)
+				classnames(
+					classes.root,
+					hiddenControls ?
+						(toolbarsVisible ? classes.show : classes.hide) :
+						classes.show)
 			}
 		>
 			<Tooltip title={micTip} placement={smallScreen ? 'top' : 'right'}>
@@ -224,6 +229,7 @@ ButtonControlBar.propTypes =
 {
 	roomClient      : PropTypes.any.isRequired,
 	toolbarsVisible : PropTypes.bool.isRequired,
+	hiddenControls  : PropTypes.bool.isRequired,
 	me              : appPropTypes.Me.isRequired,
 	micProducer     : appPropTypes.Producer,
 	webcamProducer  : appPropTypes.Producer,
@@ -235,6 +241,7 @@ ButtonControlBar.propTypes =
 const mapStateToProps = (state) =>
 	({
 		toolbarsVisible : state.room.toolbarsVisible,
+		hiddenControls  : state.settings.hiddenControls,
 		...meProducersSelector(state),
 		me              : state.me
 	});
@@ -248,6 +255,7 @@ export default withRoomContext(connect(
 		{
 			return (
 				prev.room.toolbarsVisible === next.room.toolbarsVisible &&
+				prev.settings.hiddenControls === next.settings.hiddenControls &&
 				prev.producers === next.producers &&
 				prev.me === next.me
 			);
diff --git a/app/src/components/Room.js b/app/src/components/Room.js
index c216f46..b6027ba 100644
--- a/app/src/components/Room.js
+++ b/app/src/components/Room.js
@@ -27,7 +27,7 @@ import WakeLock from 'react-wakelock-react16';
 import ExtraVideo from './Controls/ExtraVideo';
 import ButtonControlBar from './Controls/ButtonControlBar';
 
-const TIMEOUT = 5 * 1000;
+const TIMEOUT = window.config.hideTimeout || 5000;
 
 const styles = (theme) =>
 	({