Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

icysapphire's Fix for people appearing appearing on top of each other #282

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
90202a4
v1.38: Workaround for bug (isPinned)
icysapphire Jul 6, 2020
f8ef426
v1.39: Bugfix
icysapphire Jul 10, 2020
42f65c4
Improved Spanish and Catalan localizations
buenoudg Sep 7, 2020
050c51e
Fixed typo in the Spanish localization
buenoudg Sep 7, 2020
285ff55
Fixed typo in Catalan localization
buenoudg Sep 7, 2020
b7c3d75
y
icysapphire Sep 7, 2020
041c6a5
y
icysapphire Sep 7, 2020
1e35e2f
y
icysapphire Sep 7, 2020
f26af2c
y
icysapphire Sep 7, 2020
fb288c5
Merge pull request #1 from buenoudg/master
icysapphire Sep 7, 2020
d3127e2
v1.40: fixes
icysapphire Sep 10, 2020
aa8cd3c
Y
icysapphire Sep 10, 2020
966b49c
Merge
icysapphire Sep 10, 2020
fc2db45
Some localizations (en, es, ca) for new strings
buenoudg Sep 11, 2020
e119cd7
Merge pull request #5 from buenoudg/patch-2
icysapphire Sep 12, 2020
9d26aea
Some spanish localization fixes
buenoudg Sep 13, 2020
4fe4824
Merge pull request #6 from buenoudg/patch-2
icysapphire Sep 17, 2020
a4f9298
Update README.md
icysapphire Feb 11, 2021
7413628
Update README.md
icysapphire Feb 15, 2021
a6bffbb
y
icysapphire Feb 21, 2021
d76e3d7
y
icysapphire Feb 23, 2021
afeb90e
y
icysapphire Feb 23, 2021
f42d4fa
improvements
icysapphire Feb 24, 2021
d03e9ad
y
icysapphire Feb 24, 2021
adfb051
bugfix + better tile layout
icysapphire Mar 3, 2021
d60a328
own presentation show
icysapphire Mar 8, 2021
bbec4c7
fix
icysapphire Mar 8, 2021
e252607
y
icysapphire Mar 8, 2021
cd97e11
y
icysapphire Mar 11, 2021
f95bb8e
y
icysapphire Mar 24, 2021
3ff8eb7
y
icysapphire Mar 30, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified build.sh
100644 → 100755
Empty file.
Binary file modified extension/icon128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified extension/icon24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified extension/icon36.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified extension/icon48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions extension/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"manifest_version": 2,
"name": "Google Meet Grid View",
"name": "Google Meet Grid View (fix)",
"description": "Adds a toggle to use a grid layout in Google Meets",
"version": "1.37.0",
"author": "Chris Gamble",
"homepage_url": "https://github.com/Fugiman/google-meet-grid-view",
"version": "1.39.0",
"author": "Simone Marullo",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in the manifest file should probably be pulled out before merging.

"homepage_url": "https://github.com/icysapphire/google-meet-grid-view",
"icons": {
"24": "icon24.png",
"36": "icon36.png",
Expand Down
6 changes: 3 additions & 3 deletions grid.user.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ==UserScript==
// @name Google Meet Grid View
// @namespace https://fugi.tech/
// @version 1.37
// @version 1.39
// @description Adds a toggle to use a grid layout in Google Meets
// @author Chris Gamble
// @include https://meet.google.com/*
Expand Down Expand Up @@ -983,7 +983,7 @@
return {
set: function (obj, prop, value) {
if (value && typeof value === 'function') {
const m = /\.([A-Za-z]+)\([a-zA-Z,.]+\{[^\x05]*?this\.([A-Za-z]+)=[A-Za-z]+\(this\)/.exec(value.toString())
const m = /\.([A-Za-z]+)\([a-zA-Z,.]+\{[^\x05]*?this\.([A-Za-z]+)=[A-Za-z0-9]+\(this\)/.exec(value.toString())
if (m) {
console.log('[google-meet-grid-view] Successfully hooked into rendering pipeline v3', value)
value = new Proxy(value, RefreshVideoProxyHandlerV3(m[2], m[1]))
Expand Down Expand Up @@ -1358,7 +1358,7 @@
ordering.sort((a, b) => a.name.localeCompare(b.name) || a.id.localeCompare(b.id))

// Set Pinned Index for use in CSS loop. If there is no pin, use the presenter if available
let pinnedIndex = ret.findIndex(v => v[magicKey].isPinned())
let pinnedIndex = -1
if (pinnedIndex < 0) {
pinnedIndex = ret.findIndex(v => v.__gmgvIsPresentation)
}
Expand Down