Pārlūkot izejas kodu

fix(toolbar): tweak overflow menu order (#2781)

master
virtuacoplenny 7 gadus atpakaļ
vecāks
revīzija
0afe72d42b
1 mainītis faili ar 24 papildinājumiem un 24 dzēšanām
  1. 24
    24
      react/features/toolbox/components/Toolbox.web.js

+ 24
- 24
react/features/toolbox/components/Toolbox.web.js Parādīt failu

@@ -973,13 +973,25 @@ class Toolbox extends Component<Props, State> {
973 973
                 && <OverflowMenuProfileItem
974 974
                     key = 'profile'
975 975
                     onClick = { this._onToolbarToggleProfile } />,
976
-            this._shouldShowButton('settings')
976
+            this._shouldShowButton('videoquality')
977 977
                 && <OverflowMenuItem
978
-                    accessibilityLabel = 'Settings'
979
-                    icon = 'icon-settings'
980
-                    key = 'settings'
981
-                    onClick = { this._onToolbarToggleSettings }
982
-                    text = { t('toolbar.Settings') } />,
978
+                    accessibilityLabel = 'Call quality'
979
+                    icon = { 'icon-visibility' }
980
+                    key = 'videoquality'
981
+                    onClick = { this._onToolbarOpenVideoQuality }
982
+                    text = { t('toolbar.callQuality') } />,
983
+            this._shouldShowButton('fullscreen')
984
+                && <OverflowMenuItem
985
+                    accessibilityLabel = 'Full screen'
986
+                    icon = { _fullScreen
987
+                        ? 'icon-exit-full-screen'
988
+                        : 'icon-full-screen' }
989
+                    key = 'fullscreen'
990
+                    onClick = { this._onToolbarToggleFullScreen }
991
+                    text = { _fullScreen
992
+                        ? t('toolbar.exitFullScreen')
993
+                        : t('toolbar.enterFullScreen') } />,
994
+            this._renderRecordingButton(),
983 995
             this._shouldShowButton('sharedvideo')
984 996
                 && <OverflowMenuItem
985 997
                     accessibilityLabel = 'Shared video'
@@ -999,25 +1011,13 @@ class Toolbox extends Component<Props, State> {
999 1011
                     text = { _editingDocument
1000 1012
                         ? t('toolbar.documentClose')
1001 1013
                         : t('toolbar.documentOpen') } />,
1002
-            this._shouldShowButton('fullscreen')
1003
-                && <OverflowMenuItem
1004
-                    accessibilityLabel = 'Full screen'
1005
-                    icon = { _fullScreen
1006
-                        ? 'icon-exit-full-screen'
1007
-                        : 'icon-full-screen' }
1008
-                    key = 'fullscreen'
1009
-                    onClick = { this._onToolbarToggleFullScreen }
1010
-                    text = { _fullScreen
1011
-                        ? t('toolbar.exitFullScreen')
1012
-                        : t('toolbar.enterFullScreen') } />,
1013
-            this._renderRecordingButton(),
1014
-            this._shouldShowButton('videoquality')
1014
+            this._shouldShowButton('settings')
1015 1015
                 && <OverflowMenuItem
1016
-                    accessibilityLabel = 'Call quality'
1017
-                    icon = { 'icon-visibility' }
1018
-                    key = 'videoquality'
1019
-                    onClick = { this._onToolbarOpenVideoQuality }
1020
-                    text = { t('toolbar.callQuality') } />,
1016
+                    accessibilityLabel = 'Settings'
1017
+                    icon = 'icon-settings'
1018
+                    key = 'settings'
1019
+                    onClick = { this._onToolbarToggleSettings }
1020
+                    text = { t('toolbar.Settings') } />,
1021 1021
             this._shouldShowButton('stats')
1022 1022
                 && <OverflowMenuItem
1023 1023
                     accessibilityLabel = 'Speaker stats'

Notiek ielāde…
Atcelt
Saglabāt