fix(service-providers): incorrect window size (#1791)

netless-io · Nov 28, 2022 · f4c4101 · f4c4101
1 parent e3ac690
commit f4c4101
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/flat-stores/src/classroom-store/index.ts b/packages/flat-stores/src/classroom-store/index.ts
@@ -155,6 +155,7 @@ export class ClassroomStore {
             deviceStateStorage: false,
             classroomStorage: false,
             onStageUsersStorage: false,
+            shareScreenInfo: observable.ref,
         });
 
         this.sideEffect.addDisposer(

diff --git a/service-providers/agora-rtc/agora-rtc-electron/src/rtc-share-screen.ts b/service-providers/agora-rtc/agora-rtc-electron/src/rtc-share-screen.ts
@@ -136,8 +136,9 @@ export class AgoraRTCElectronShareScreen extends IServiceShareScreen {
                     screenId: info.windowId,
                     name: `${info.ownerName} - ${info.name}`,
                     image: info.image,
-                    width: info.width,
-                    height: info.height,
+                    // There's no other way to get the original window size :/
+                    width: info.originWidth,
+                    height: info.originHeight,
                 };
             }
         };
@@ -187,18 +188,17 @@ export class AgoraRTCElectronShareScreen extends IServiceShareScreen {
         this._pTogglingShareScreen = new Promise<void>(resolve => {
             this.client.once("videoSourceJoinedSuccess", () => {
                 this.client.videoSourceSetVideoProfile(43, false);
-                const { width, height } = screenInfo;
                 if (screenInfo.type === "display") {
                     this.client.videoSourceStartScreenCaptureByScreen(
                         screenInfo.screenId as ScreenSymbol,
-                        { ...rect, width, height },
-                        { ...videoSourceParams, width, height },
+                        rect,
+                        videoSourceParams,
                     );
                 } else {
                     this.client.videoSourceStartScreenCaptureByWindow(
                         screenInfo.screenId as number,
-                        { ...rect, width, height },
-                        { ...videoSourceParams, width, height },
+                        rect,
+                        videoSourceParams,
                     );
                 }
                 resolve();