Commit Graph

352 Commits

Author SHA1 Message Date
Joao Victor
acc55f0d08 fix: don't allow moderators to propagate meeting layout info (#15574). -- Currently moderators can propagate meeting layout info, but the layout which is propagated is the presenter's, not their own. This can mislead the moderators because they think their layout is being propagated but it's not. It makes more sense to allow only presenters to propagate their layouts. 2022-09-07 09:14:35 -03:00
Joao Victor
84f9eeebc4 refactor: push layout 2022-09-07 08:52:08 -03:00
Joao Victor
efb40e00bb fix(layout): don't show navbar/action-bar before layout has been calculated 2022-07-29 16:02:31 -03:00
Ramón Souza
b4fb203593 fix mobile init values for external video/screnshare 2022-07-27 10:56:04 -03:00
prlanzarin
b8811bafd4 fix(layout): use actual screen share size when calculating smart layout
Smart layout (et al) presumes screen sharing will always use 100%
width of the media area. That causes cameras to always be positioned on
top, which is not always the optimal position depending on the viewport
and stream aspect ratio/resolution - so space is wasted.

This commit uses the actual screen sharing video size as provided by
HTMLVideo's videoWidth/videoHeight properties. The calculation uses the
same logic as the one used for presentation/slides, which should make it
a bit familiar.

There's also a handler for HTMLVideo's `resize` event for those browsers
that support it - which enables handling of variable-sized screen
sharing streams. That handler is debounced at 500 ms to prevent
excessive CPU use.

Extra testing is needed with the widest range possible of
browsers/environments and feature combinations.
2022-07-22 13:28:43 +00:00
prlanzarin
8f77f4cd1f fix(layout): set external-video/screen share initial states on all layouts
Only smart layout takes screen sharing/external video states in account
when populating its initial state. The others don't, and that causes
some weird issues when switching back-and-forth between layout types due
to their input states becoming inconsistent - ie having an active screen
sharing and transitioning from Smart -> Custom would mark it as false
(due to its absence from the initial state) and pollute its state for
subsequent layouts.

This commit guarantees those features are taken into account when
populating initial input states for Focus On*/Custom layouts.
2022-07-21 18:07:49 +00:00
gabriellpr
f848d31014 modifying specific buttons
removing border and implementing box-shadow

adding transparent border

passing styles to common buttons

adding secundary color to component

updating color components
2022-07-07 10:45:54 -03:00
KDSBrowne
046518abe5 handle cursor positions for smart layout 2022-07-06 20:03:04 +00:00
Ramon Souza
edeb70de0d Merge tag 'v2.5.1' into merge25-26-jun16 2022-06-16 13:58:54 -03:00
Lucas Fialho Zawacki
a150bd20d7 feature(layout): Bring back layoutType propagation, but disallow 'custom' layout in mobile screens 2022-05-27 18:11:42 -03:00
Lucas Zawacki
cd13446c5a fix(layout): Moderators could not change layout if pushLayout was true 2022-05-24 17:31:35 -03:00
Lucas Zawacki
7ef7b52a30 feat(layout): Both presenters and moderators can set pushLayout 2022-05-24 15:38:47 -03:00
Joao Victor
e070b586c4 [2.5] fix: popover menus in RTL mode 2022-05-13 10:42:19 -03:00
Ramon Souza
0d3a5326fc Merge remote-tracking branch 'upstream/v2.5.x-release' into 25260-may10 2022-05-10 10:53:00 -03:00
Ramon Souza
07f9a192b9 Merge remote-tracking branch 'upstream/v2.4.x-release' into merge-2425-apr27 2022-04-27 15:32:20 -03:00
Lucas Zawacki
00f1b33456 feat(layout): Only propagate custom layout 2022-04-25 19:57:11 +00:00
Lucas Zawacki
7a5086cde8 fix(layout): Remove stray code from merge and fix indentation 2022-04-14 19:22:21 +00:00
Lucas Zawacki
83847a21aa Merge branch 'v2.5.x-release-Layouts' of github.com:lfzawacki/bigbluebutton into develop-bbb 2022-04-13 21:08:32 +00:00
Ramon Souza
0b26f066e0 change captions position to not depend on presentation 2022-04-13 15:10:40 -03:00
Ramon Souza
375cf41498 fix smart layout invisible video bug 2022-03-30 15:30:39 -03:00
Arthurk12
eacce4ee46 fix(layout): camera resize when pushing
Adds isResizing property to LayoutMeetings collection.
Moves the point where the last camera dock size is stored from webcam
component to custom layout component, since it is the only one with
this feature.
2022-03-22 15:29:49 -03:00
Arthurk12
1c3a5bd053 fix(layout): camera dock size
Fixes camera dock sudden increase when moving its position in custom layout.
Uses the last camera dock size stored for that dock position, if not,
make it default size.
2022-03-22 15:28:36 -03:00
Ramon Souza
7b86065e3f fix smart layout invisible video bug 2022-03-17 11:06:21 -03:00
Max Franke
93013d5ad1 fix(layout): layout modal styled components
Add custom layout svgs
If a custom style is set via bbb_custom_style_url or settings.yml,
the svgs applied will be the ones inside the /images/layouts/customStyle/ folder
2022-03-15 14:22:36 -03:00
Lucas Zawacki
d30fc746a4 fix(layout): Fix code after merges 2022-03-09 18:28:12 -03:00
Max Franke
e7e0b25b18 fix(layout): remove unused state 2022-03-09 18:10:20 -03:00
Lucas Zawacki
31ddd9a8d8 fix(layout): Better config names for layout push/toggle 2022-03-09 18:10:09 -03:00
Max Franke
3549d3bfa6 fix(layout): keep border when active
Fixes an issue when the selected layout would not stay "active" when
another object was focused.
Now the selected layout always appears with a border, even if it is
the first time the modal is opened.
2022-03-09 17:13:58 -03:00
Max Franke
0f27b1add4 feat(layout): new layout modal
Add a new modal that makes it easier to switch between layouts
Adds a new flag in html5 settings that allows to enable/disable
keepPushing layout
2022-03-09 17:00:06 -03:00
Arthurk12
5100049c29 fix(layout): webcam container resize bar
Fixes missing webcam container's resize bar on custom layout when cameras
are placed at the bottom of the presentation and the chat is closed.
2022-03-09 16:49:24 -03:00
Anton Georgiev
9cd7eccf63
Merge pull request #14558 from ramonlsouza/issue-14552
fix: Video warning keeps showing after hiding presentation/external video
2022-03-08 12:18:03 -05:00
Ramón Souza
38d804da37 do not display external video message when it is minimized 2022-03-08 17:10:26 +00:00
Ramón Souza
9ec9bfc790 do not display presentation placeholder in smart layout 2022-03-07 20:21:58 +00:00
Ramón Souza
6d268c4092 refactor isMobile check in actions-dropdown 2022-03-03 17:46:20 +00:00
Lucas Zawacki
43afef9bad feature(layout): Remove 'swap layout' concept 2022-02-24 16:05:18 -03:00
Lucas Zawacki
8d6931f656 feature(layout): Add focused camera to layout context 2022-02-24 14:22:00 -03:00
Lucas Zawacki
6dfdc6a579 feature(layout): Push most layout parts with custom layout 2022-02-24 13:21:16 -03:00
Ramón Souza
dba04834c7 Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08 2022-02-09 15:52:42 +00:00
Ramón Souza
b028e4f4aa do not use presentation size for screenshare and external video in smart layout 2022-02-07 19:29:27 +00:00
Ramón Souza
16cd3c4ebb Merge remote-tracking branch 'upstream/v2.4.x-release' into dev-24-0125 2022-01-25 16:56:52 +00:00
Ramón Souza
a9d4d87d2a restore missing variable 2022-01-21 17:38:25 +00:00
Ramón Souza
bc9957c13d add background to cameras/presentation when positioned in sidebar-content 2022-01-21 13:24:03 +00:00
Max
38d95b0ea8 fix(layout): hide/show media in videoFocus
Fix an error that the hide/show button does not work when there is external
video/screenshare and the layout is "videoFocus".
2022-01-17 19:11:43 -03:00
Ramón Souza
d4c1b985b3 fix webcam overlap in breakout room 2022-01-12 19:30:14 +00:00
Ramón Souza
f6e65f58c5 merge 2.4 into develop and resolve conflicts - partial 2022-01-12 16:40:45 +00:00
Arthurk12
63d3d3efd2 fix(layout): sidebar inconsistent state
Fixes initial state of navigation sidebar.
Navigation sidebar opens along with the content sidebar.
2022-01-03 19:51:05 +00:00
Arthurk12
aabee1ee6f fix(layout): navigation sidebar not opening with content sidebar
Forces navigation sidebar to open with content sidebar.
2021-12-20 18:24:30 +00:00
Ramón Souza
d1c516fef6 resolve html5 conflicts 2021-12-10 21:07:35 +00:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
Ramón Souza
6b67527f8d fix sidebar media position with banner 2021-12-02 12:17:40 +00:00
Ramón Souza
e4e7721890 reduce minimal sidebar values - 2.4 2021-11-30 16:43:16 +00:00
Ramón Souza
b8e7641403 increase sidebar-content max width value 2021-11-30 14:07:30 +00:00
Ramón Souza
c43991e6b5 fix cameras margin RTL - smart layout 2021-11-22 11:58:35 +00:00
Ramón Souza
4207502db1 remove unused imports/exports 2021-11-17 12:26:26 +00:00
Ramón Souza
9ee4975e7f fix minimize presentation focus on presentation layout 2021-11-12 17:08:31 +00:00
Max Franke
b507eeb80f feat(external-videos): rewrite fullscreen button
Following BBB v2.4 new layout manager fullscreen changes
2021-10-29 10:55:34 -03:00
Anton Georgiev
24d672a832 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:13:17 +00:00
Ramón Souza
4aab0eb043 fix fullscreen cameras with hidden presentation 2021-10-04 12:13:37 +00:00
Ramon Souza
4355601945 move isMobile and isTablet to layoutEngine 2021-09-24 14:38:44 -03:00
Ramon Souza
b22c12aef7 calculatesCameraDockBounds refactor - presentationFocus, smart and videoFocus layouts 2021-09-24 14:16:37 -03:00
Ramon Souza
30623b0c4f remove duplicated functions from video focus layout 2021-09-24 13:19:41 -03:00
Ramon Souza
5ed7c06763 remove duplicated functions from smart layout 2021-09-24 11:48:59 -03:00
Ramon Souza
e47d62a224 remove duplicated functions from presentation focus layout 2021-09-24 11:08:50 -03:00
Ramon Souza
72bd47f457 move duplicated functions from customLayout to layoutEngine 2021-09-24 10:41:28 -03:00
Ramon Souza
4f54f32a1a rename BaseLayout -> LayoutEngine 2021-09-23 17:46:50 -03:00
Ramon Souza
7f9bf6d167 move calculatesNavbarBounds and calculatesActionbarHeight to BaseLayout 2021-09-23 17:43:02 -03:00
Ramon Souza
a7a68e7d11 calculatesCameraDockBounds refactor - customLayout 2021-09-23 16:21:06 -03:00
Ramon Souza
668d2f8a25 add baseLayout component 2021-09-23 10:34:36 -03:00
Vitor Mateus De Almeida
f5bf6675de fixes user list appears even if custom parameters is false 2021-09-22 18:26:37 -03:00
Anton Georgiev
ab845b3078 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-rc-1-into-dev 2021-09-22 15:28:13 +00:00
Ramon Souza
a86df37bfe fix camera resizing bug 2021-09-21 17:20:32 -03:00
Vitor Mateus De Almeida
f6e17ba398 change cameraDock size in vertical position 2021-09-15 09:33:31 -03:00
Vitor Mateus De Almeida
c47cf21ba2 place both buttons at the bottom of the video dock when cameras are vertically positioned 2021-09-15 09:13:17 -03:00
Ramon Souza
9300b9b382 Merge remote-tracking branch 'upstream/develop' into use-context-selector 2021-09-13 15:41:52 -03:00
Ramon Souza
ada60253a2 fix presentation position - custom layout 2021-09-13 09:56:42 -03:00
Ramon Souza
098826c70a rename layout functions 2021-09-10 17:48:52 -03:00
Ramon Souza
981e707612 add selector to containers, remove old layoutContext + convert base component into function 2021-09-10 14:21:04 -03:00
Ramon Souza
dbe4d88638 fix SET_SIDEBAR_NAVIGATION_OUTPUT context action 2021-09-09 16:17:31 -03:00
Ramon Souza
e2ea9092f7 fix update bug 2021-09-09 14:43:06 -03:00
Ramon Souza
f10c34bc94 add use-context-selector changes to videoFocusLayout 2021-09-09 14:18:46 -03:00
Ramon Souza
fd89d56011 add use-context-selector changes to presentationFocusLayout 2021-09-09 13:36:24 -03:00
Ramon Souza
998de7dfd5 add use-context-selector changes to smartLayout 2021-09-09 11:48:04 -03:00
Ramon Souza
d1a0020f0d fix sonarcloud alerts 2021-09-09 11:08:36 -03:00
Ramon Souza
f3bd32b5df add use-context-selector lib and changes to customLayout 2021-09-09 10:51:18 -03:00
Ramon Souza
2e8ac9af27 fix swap layout camera dock size 2021-09-02 15:29:35 -03:00
Ramon Souza
a201c873e4 fix incorrect camera position in mobile - smart layout 2021-08-30 08:54:49 -03:00
Ramon Souza
713ad36280 remove old pt-br comment 2021-08-24 17:29:20 -03:00
Ramon Souza
4c381a5805 remove unused imports/variables 2021-08-24 13:24:48 -03:00
Ramon Souza
e737b50bee width -> maxWidth 2021-08-17 11:20:26 -03:00
Ramon Souza
230cce6f3a restore captions feature in new layouts 2021-08-16 10:38:39 -03:00
Ramon Souza
5c51b67d43 fix presentation position in focus on video layout 2021-08-12 11:08:43 -03:00
Ramon Souza
e1b52321c7 fix camera position - rtl languages 2021-08-10 09:19:45 -03:00
Ramon Souza
5745d2d37d fix camera position when presentation is minimized 2021-08-10 09:05:34 -03:00
Vitor Mateus De Almeida
145ca61d40 linting some files 2021-08-09 11:24:02 -03:00
Ramon Souza
c00ac3f18a Merge remote-tracking branch 'upstream/develop' into issue-12880 2021-08-05 13:24:37 -03:00
Ramon Souza
89079a9ebf prevent sidebar height > maxHeight - focus on video 2021-08-05 10:53:35 -03:00
Vitor Mateus De Almeida
1b18977eac rename all NewLayout.. to Layout.. 2021-08-05 08:03:24 -03:00
Vitor Mateus De Almeida
09082734c9 remove old media, webcam draggable and panel components 2021-08-05 04:26:03 -03:00
Vitor Mateus De Almeida
abf089ae73 remove layout manager legacy 2021-08-05 01:22:07 -03:00
Ramon Souza
321eeb6cfa Merge remote-tracking branch 'upstream/develop' into issue-12880 2021-08-04 11:58:07 -03:00
Ramon Souza
523897c2d3 limit camera size based on toolbar size 2021-08-04 11:38:20 -03:00
Ramon Souza
c6f6f02f40 fix presentation toolbar position in small window - partial 2021-08-04 08:42:38 -03:00
Ramon Souza
de11e88139 fix media and webcam position for RTL languages - custom layout 2021-08-03 14:03:06 -03:00
Ramon Souza
cf220e0971 fix media and webcam position for RTL languages - smart layout 2021-08-03 13:33:54 -03:00
Anton Georgiev
d01e4e657b
Merge pull request #12873 from vitormateusalmeida/layoutManagerNew
Add resize in sidebar from bottom in presentation focus layout
2021-07-30 15:17:36 -04:00
Vitor Mateus De Almeida
429b76ad6b fix resize in mobile - videoFocus 2021-07-30 16:07:49 -03:00
Vitor Mateus De Almeida
5930c20dc3 add resize from bottom in presentation focus layout 2021-07-30 14:42:46 -03:00
Vitor Mateus De Almeida
d24dd84af9 linting 2021-07-30 10:31:15 -03:00
Ramon Souza
8a18c6103c fix min values - smart layout 2021-07-29 15:22:46 -03:00
Ramon Souza
0fb0da3fc0 rtl tweaks - custom layout 2021-07-29 10:19:16 -03:00
Ramon Souza
41a8bc48bf Merge remote-tracking branch 'upstream/develop' into webcam-margin-new-lm 2021-07-29 09:36:07 -03:00
Anton Georgiev
9671c32f97
Merge pull request #12846 from ramonlsouza/rtl-new-layouts
fix: RTL issues - new layouts
2021-07-29 08:26:56 -04:00
Ramon Souza
170719d144 add webcam margin - custom layout 2021-07-29 08:50:57 -03:00
Ramon Souza
103922b010 fix smart layout margin 2021-07-28 17:13:45 -03:00
Ramon Souza
b99d67a421 add horizontal margin when camera is on left side 2021-07-28 15:48:22 -03:00
Ramon Souza
919bc50503 sets default value for sidebar minimum height 2021-07-28 10:54:06 -03:00
Ramon Souza
3d47c4c1ae camera resize sides - custom layout 2021-07-27 16:39:28 -03:00
Ramon Souza
efe37a2ef9 code format 2021-07-27 16:34:21 -03:00
Ramon Souza
07a2db6265 Merge remote-tracking branch 'upstream/develop' into rtl-new-layouts 2021-07-27 16:25:15 -03:00
Ramon Souza
f642175a59 rtl video focus layout 2021-07-27 14:39:10 -03:00
Ramon Souza
731fef4ba5 rtl presentation focus layout 2021-07-27 14:05:49 -03:00
Ramon Souza
0b30bed12a rtl custom layout - partial 2021-07-27 13:23:00 -03:00
Anton Georgiev
9e644e8bc7
Merge pull request #12807 from ramonlsouza/actionsbar-new-lm
refactor: actions bar size calculation - new layouts
2021-07-27 11:29:54 -04:00
Ramon Souza
8c95520aee fix fullscreen camera position 2021-07-27 09:02:00 -03:00
Ramon Souza
da14f07d00 fiz sidebar resize rtl - smart layout 2021-07-27 08:38:53 -03:00
Ramon Souza
d3ed4d6ea6 rtl smart layout 2021-07-26 17:45:03 -03:00
Ramon Souza
2de8e1e84a add isRTL value to context 2021-07-26 11:03:31 -03:00
Ramon Souza
d9a100110e add webcam margin - smart layout 2021-07-23 09:53:01 -03:00
Ramon Souza
0f2ae0425c fix sidebar content when presentation is hidden 2021-07-22 17:37:46 -03:00
Ramon Souza
3065597635 fix cameras when presentation is hidden - custom layout 2021-07-22 17:31:19 -03:00
Ramon Souza
0a2a6b13bb Merge remote-tracking branch 'upstream/develop' into actionsbar-new-lm 2021-07-22 14:44:37 -03:00
Ramon Souza
27c5c9e3e7 isolate actions bar height calculation 2021-07-22 11:42:45 -03:00
Ramon Souza
2ef6d30a01 fix actions bar size calculation - new layouts 2021-07-22 11:04:38 -03:00
Ramon Souza
43e42d98cb display sidebar content when switching device to tablet 2021-07-21 15:34:34 -03:00
Ramon Souza
945bed95d3 fix chat stuck on resize 2021-07-21 15:12:05 -03:00
Anton Georgiev
4baf67c24d
Merge pull request #12796 from ramonlsouza/fix-start-closed-chat
fix: start closed chat option does not work
2021-07-20 16:25:35 -04:00
Ramon Souza
f7c4171a75 make poll, notes and chat panel use the same min and max width - legacy layout 2021-07-20 11:42:15 -03:00
Ramon Souza
92edd08448 fix start closed chat option 2021-07-20 10:19:48 -03:00
Anton Georgiev
218db31ca2
Merge pull request #12787 from ramonlsouza/fs-cameras-focus-presentation
fix: fullscreen cameras - focus on presentation
2021-07-19 16:25:55 -04:00
Ramon Souza
355f1f33c8 fix cameras fullscreen - focus on presentation 2021-07-19 10:31:38 -03:00
Ramon Souza
791a4e773a make camera use 100% available space in smart and custom when swapLayout 2021-07-16 16:39:58 -03:00
Ramon Souza
384fac8392 fix empty panel when switching layouts 2021-07-14 10:53:10 -03:00
Ramon Souza
5ef496e2b9 fix sidebar z-index - new lm 2021-07-13 16:23:34 -03:00
Vitor Mateus De Almeida
9e055265c3 fix resizable wrapper 2021-07-13 09:56:39 -03:00
Vitor Mateus De Almeida
f0145e001e Add resizable and draggable in cameras dock
Remove settings and change resizable context data

Add resizable draggable drop areas in cameras dock
2021-07-13 04:25:03 -03:00
Anton Georgiev
36595c7375
Merge pull request #12729 from ramonlsouza/fullscreen-camera
feat: fullscreen cameras and screenshare in new Layout Manager
2021-07-12 14:33:35 -04:00
Ramon Souza
3634586dd1 add notifications bar to new layout manager 2021-07-12 13:24:53 -03:00
Ramon Souza
fc33c02a2a add banner-bar to new layout manager 2021-07-12 10:22:26 -03:00
Anton Georgiev
b9cc633286 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.3.5-into-develop 2021-07-06 19:36:19 +00:00
Ramon Souza
07ab688a4a fullscreen screenshare 2021-07-06 16:27:28 -03:00