Fixed screenshare, removed unused graphics and updated color theme fo…

…r css
Milkshiift · Mar 23, 2023 · a2721f4 · a2721f4
1 parent 5ed0c9d
commit a2721f4
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 15 deletions.
diff --git a/assets/ac_black_plug.png b/assets/ac_black_plug.png
diff --git a/assets/ac_black_plug_hollow.png b/assets/ac_black_plug_hollow.png
diff --git a/assets/ac_white_plug.png b/assets/ac_white_plug.png
diff --git a/assets/ac_white_plug_hollow.png b/assets/ac_white_plug_hollow.png
diff --git a/assets/clsc-dsc-tray.png b/assets/clsc-dsc-tray.png
diff --git a/assets/dsc-tray.png b/assets/dsc-tray.png
diff --git a/assets/macos.png b/assets/macos.png
diff --git a/assets/screenshot-1920x1080.png b/assets/screenshot-1920x1080.png
diff --git a/src/content/css/screenshare.css b/src/content/css/screenshare.css
@@ -4,7 +4,7 @@
     left: 0;
     width: 100%;
     height: 100vh;
-    background: rgba(30, 30, 30, 0.75);
+    background: #313338;
     color: #ffffff;
     z-index: 10000000;
     display: flex;
@@ -43,7 +43,7 @@
     border: 0;
     border-radius: 3px;
     padding: 4px;
-    background: #2c2f33;
+    background: #23272a;
     text-align: left;
 }
 
@@ -52,7 +52,7 @@
 
 .desktop-capturer-selection__btn:hover,
 .desktop-capturer-selection__btn:focus {
-    background: #7289da;
+    background: #5865f2;
     box-shadow: 0 0 4px rgba(0, 0, 0, 0.45), 0 0 2px rgba(0, 0, 0, 0.25);
     color: #fff;
 }

diff --git a/src/content/css/settings.css b/src/content/css/settings.css
@@ -20,13 +20,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.*/
 :root {
-    --background-secondary: #2f3136;
+    --background-secondary: #474554;
     --background-secondary-alt: #292b2f;
-    --background-floating: #18191c;
+    --background-floating: #23272a;
     --background-modifier-hover: rgba(106, 116, 128, 0.16);
-    --brand-experiment: #7289da;
+    --brand-experiment: #5865f2;
     --brand-experiment-560: #5c6fb1;
-    --brand-experiment-600: #4e5d94;
+    --brand-experiment-600: #aca5db;
     --interactive-normal: #b9bbbe;
     --interactive-hover: #dcddde;
     --text-muted: #72767d;
@@ -165,7 +165,7 @@ button {
 }
 
 button:hover {
-    background: var(--brand-experiment-560);
+    background: var(--brand-experiment-600);
     cursor: pointer;
     transition: 0.17s ease;
 }

diff --git a/src/extensions/mods.ts b/src/extensions/mods.ts
@@ -17,6 +17,5 @@ const unstrictCSP = () => {
     });
 };
 electron.app.whenReady().then(async () => {
-    console.log("TESTTTTTTT");
     unstrictCSP();
 });
diff --git a/src/screenshare/main.ts b/src/screenshare/main.ts
@@ -14,10 +14,7 @@ function registerCustomHandler() {
         capturerWindow = new BrowserWindow({
             width: 800,
             height: 600,
-            title: "GoofCord Screenshare",
-            darkTheme: true,
-            icon: iconPath,
-            frame: true,
+            frame: false,
             autoHideMenuBar: true,
             webPreferences: {
                 sandbox: false,
@@ -26,8 +23,8 @@ function registerCustomHandler() {
             }
         });
         ipcMain.once("selectScreenshareSource", (event, id, name) => {
-            console.log(sources[id]);
-            console.log(id);
+            //console.log(sources[id]);
+            //console.log(id);
             capturerWindow.close();
             const result = {id, name, width: 9999, height: 9999};
             callback({video: result});

diff --git a/src/window.ts b/src/window.ts
@@ -91,6 +91,8 @@ async function doAfterDefiningTheWindow() {
         }
         return {action: "deny"};
     });
+    console.log("Starting screenshare module...");
+    import("./screenshare/main");
 
     //Blocking discords trash
     mainWindow.webContents.session.webRequest.onBeforeRequest(