aboutsummaryrefslogtreecommitdiff
path: root/app/features/conference/components
diff options
context:
space:
mode:
authorKlemens Arro <klemens.arro@admcloudtech.com>2020-04-12 13:52:20 +0300
committerSaúl Ibarra Corretgé <s@saghul.net>2020-04-14 09:19:41 +0200
commitbbe835d23a52019ad4554c234b5737f0ebaa7821 (patch)
treee882fbdde2f9a2cdfbd64e35f2243d203ad7415a /app/features/conference/components
parent5a863ab904935cd259bb30a9e155b7665e36644f (diff)
Add always on top window toggle to settings
This commit will add a toggle to settings drawer to enable/disable the floating (always on top) window during a call (issue #171). This feature is based on the code from pull request #172 by @gorance-teletrader.
Diffstat (limited to 'app/features/conference/components')
-rw-r--r--app/features/conference/components/Conference.js15
1 files changed, 13 insertions, 2 deletions
diff --git a/app/features/conference/components/Conference.js b/app/features/conference/components/Conference.js
index a26ff9c..940653b 100644
--- a/app/features/conference/components/Conference.js
+++ b/app/features/conference/components/Conference.js
@@ -27,6 +27,11 @@ type Props = {
location: Object;
/**
+ * AlwaysOnTop Window Enabled.
+ */
+ _alwaysOnTopWindowEnabled: boolean;
+
+ /**
* Avatar URL.
*/
_avatarURL: string;
@@ -265,7 +270,12 @@ class Conference extends Component<Props, State> {
setupScreenSharingRender(this._api);
new RemoteControl(iframe); // eslint-disable-line no-new
- setupAlwaysOnTopRender(this._api);
+
+ // Allow window to be on top if enabled in settings
+ if (this.props._alwaysOnTopWindowEnabled) {
+ setupAlwaysOnTopRender(this._api);
+ }
+
setupWiFiStats(iframe);
setupPowerMonitorRender(this._api);
@@ -409,7 +419,8 @@ function _mapStateToProps(state: Object) {
_name: state.settings.name,
_serverURL: state.settings.serverURL,
_startWithAudioMuted: state.settings.startWithAudioMuted,
- _startWithVideoMuted: state.settings.startWithVideoMuted
+ _startWithVideoMuted: state.settings.startWithVideoMuted,
+ _alwaysOnTopWindowEnabled: state.settings.alwaysOnTopWindowEnabled
};
}