Skip to content

[pull] dev from Legcord:dev #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Jan 2, 2026
Merged

[pull] dev from Legcord:dev #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
677506b
fix trailing bar collision with nav bar (#993)
lbrooney Jan 1, 2026
485e560
fix: YouTube embeds in chat and watch together activity (#994)
MahmodZE Jan 1, 2026
004bc92
feat: refactored and redesigned some ui components (#995)
MahmodZE Jan 1, 2026
b03371c
fix: improve the keybind maker (#996)
MahmodZE Jan 1, 2026
0e215e6
feat: fix macOS titlebar CSS
smartfrigde Jan 1, 2026
64d08d5
fix: download apps button
smartfrigde Jan 1, 2026
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
8 changes: 4 additions & 4 deletions assets/app/css/darwinTitlebar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
display: block;
line-height: 45px;
left: 0;
transform: translate(-82px, 4px);
transform: translate(-82px, 0px);
}

[legcord-platform="darwin"] #window-controls-container:hover #minimize #minimize-icon,
Expand All @@ -36,23 +36,23 @@
no-repeat 50% 50%;
mask: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAxMiAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNNS4yOTI4OSA2TDIuODE4MDEgMy41MjUxM0wzLjUyNTEyIDIuODE4MDJMNS45OTk5OSA1LjI5Mjg5TDguNDc0ODcgMi44MTgwMkw5LjE4MTk3IDMuNTI1MTNMNi43MDcxIDZMOS4xODE5NyA4LjQ3NDg3TDguNDc0ODcgOS4xODE5OEw1Ljk5OTk5IDYuNzA3MTFMMy41MjUxMiA5LjE4MTk4TDIuODE4MDEgOC40NzQ4N0w1LjI5Mjg5IDZaIiBmaWxsPSJyZ2JhKDEyOCwgNiwgMCwgMSkiLz48L3N2Zz4=")
no-repeat 50% 50%;
transform: translate(-0.3px, -9px);
transform: translate(-0.4px, -7px);
}
[legcord-platform="darwin"]:not([unFocused]) #window-controls-container #minimize #minimize-icon {
background-color: #7d631b;
-webkit-mask: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAxMiAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNMTAgNS4zOTk5OUgyVjYuNTk5OTlIMTBWNS4zOTk5OVoiIGZpbGw9IiM5ODY4MDEiLz48L3N2Zz4=")
no-repeat 50% 50%;
mask: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAxMiAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNMTAgNS4zOTk5OUgyVjYuNTk5OTlIMTBWNS4zOTk5OVoiIGZpbGw9IiM5ODY4MDEiLz48L3N2Zz4=")
no-repeat 50% 50%;
transform: translate(-0px, -9px);
transform: translate(-0px, -7px);
}
[legcord-platform="darwin"]:not([unFocused]) #window-controls-container #maximize #maximize-icon {
background-color: #1d7525;
-webkit-mask: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAxMiAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNOC41ODgyMyA2Ljk5MDE1TDUuMDA5NzkgMy40MTE3QzQuODU1ODMgMy4yNTc3NCA0Ljk1ODYgMi45OTQyMiA1LjE3NjE0IDIuOTg1MTRMOC45MTA0MiAyLjgyOTMxQzkuMDU2NTggMi44MjMyMSA5LjE3NjczIDIuOTQzMzUgOS4xNzA2MyAzLjA4OTUyTDkuMDE0NzkgNi44MjM4QzkuMDA1NzEgNy4wNDEzNCA4Ljc0MjE5IDcuMTQ0MTEgOC41ODgyMyA2Ljk5MDE1WiIgZmlsbD0iIzEyNUUxRSIvPjxwYXRoIGQ9Ik0zLjQxMTc3IDUuMDA5ODJMNi45OTAyMSA4LjU4ODI3QzcuMTQ0MTcgOC43NDIyMyA3LjA0MTQgOS4wMDU3NSA2LjgyMzg2IDkuMDE0ODNMMy4wODk1OCA5LjE3MDY2QzIuOTQzNDIgOS4xNzY3NiAyLjgyMzI3IDkuMDU2NjEgMi44MjkzNyA4LjkxMDQ1TDIuOTg1MjEgNS4xNzYxN0MyLjk5NDI5IDQuOTU4NjMgMy4yNTc4MSA0Ljg1NTg2IDMuNDExNzcgNS4wMDk4MloiIGZpbGw9IiMxMjVFMUUiLz48L3N2Zz4=")
no-repeat 50% 50%;
mask: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAxMiAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNOC41ODgyMyA2Ljk5MDE1TDUuMDA5NzkgMy40MTE3QzQuODU1ODMgMy4yNTc3NCA0Ljk1ODYgMi45OTQyMiA1LjE3NjE0IDIuOTg1MTRMOC45MTA0MiAyLjgyOTMxQzkuMDU2NTggMi44MjMyMSA5LjE3NjczIDIuOTQzMzUgOS4xNzA2MyAzLjA4OTUyTDkuMDE0NzkgNi44MjM4QzkuMDA1NzEgNy4wNDEzNCA4Ljc0MjE5IDcuMTQ0MTEgOC41ODgyMyA2Ljk5MDE1WiIgZmlsbD0iIzEyNUUxRSIvPjxwYXRoIGQ9Ik0zLjQxMTc3IDUuMDA5ODJMNi45OTAyMSA4LjU4ODI3QzcuMTQ0MTcgOC43NDIyMyA3LjA0MTQgOS4wMDU3NSA2LjgyMzg2IDkuMDE0ODNMMy4wODk1OCA5LjE3MDY2QzIuOTQzNDIgOS4xNzY3NiAyLjgyMzI3IDkuMDU2NjEgMi44MjkzNyA4LjkxMDQ1TDIuOTg1MjEgNS4xNzYxN0MyLjk5NDI5IDQuOTU4NjMgMy4yNTc4MSA0Ljg1NTg2IDMuNDExNzcgNS4wMDk4MloiIGZpbGw9IiMxMjVFMUUiLz48L3N2Zz4=")
no-repeat 50% 50%;
transform: translate(0.1px, -9px);
transform: translate(0px, -7px);
}

[legcord-platform="darwin"] #window-controls-container #minimize {
Expand Down
2 changes: 1 addition & 1 deletion assets/app/css/discord.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
color: var(--text-muted);
}

div[class^="listItem__"]:has([data-list-item-id="guildsnav___app-download-button"]) {
div:has(> span [data-list-item-id="guildsnav___app-download-button"]) {
display: none !important;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/app/css/linuxTitlebar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[legcord-platform="linux"] div[class^="trailing_"] {
[legcord-platform="linux"] div[class*="title"] + div[class*="trailing"] {
margin-right: 150px;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/app/css/winTitlebar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Legcord on Windows */

[legcord-platform="win32"] div[class^="trailing_"] {
[legcord-platform="win32"] div[class*="title"] + div[class*="trailing"] {
margin-right: 150px;
}

Expand Down
3 changes: 3 additions & 0 deletions biome.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
"style": {
"noNonNullAssertion": "off",
"noUselessElse": "off" // NOTE - This rule seems broken
},
"a11y": {
"useKeyWithClickEvents": "off"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@uwu/lune": "^1.5.1",
"@uwu/shelter-defs": "^1.4.1",
"babel-preset-solid": "^1.9.3",
"electron": "39.2.6",
"electron": "39.2.7",
"electron-builder": "^26.3.5",
"lucide-solid": "^0.475.0",
"rolldown": "1.0.0-beta.31",
Expand Down
30 changes: 15 additions & 15 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/discord/window.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ function doAfterDefiningTheWindow(passedWindow: BrowserWindow): void {
// fix UMG video playback
passedWindow.webContents.session.webRequest.onBeforeSendHeaders(
{ urls: ["https://www.youtube.com/embed/*"] },
({ requestHeaders, url }, callback) => {
requestHeaders.Referer = url;
({ requestHeaders }, callback) => {
requestHeaders.Referer = "https://google.com";
callback({ requestHeaders });
},
);
Expand Down
11 changes: 8 additions & 3 deletions src/shelter/screenshare/components/ScreensharePicker.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.sources {
grid-template-columns: auto auto;
max-height: 300px;
max-height: 260px;
overflow: hidden;
display: grid;
overflow-y: scroll;
Expand All @@ -12,10 +12,15 @@
padding: 10px;
}
.qualityBox {
gap: 10%;
display: flex;
display: grid;
grid-template-columns: auto auto;
gap: 10px 10%;
}

.checkbox {
padding-top: 10px;
}
.header {
margin-bottom: 5px;
margin-left: 5px;
}
85 changes: 48 additions & 37 deletions src/shelter/screenshare/components/ScreensharePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import type { Node } from "@vencord/venmic";
import { For, Show, createSignal } from "solid-js";
import { Dropdown } from "../../settings/components/Dropdown.jsx";
import { SegmentedControl } from "../../settings/components/SegmentedControl.jsx";
import classes from "./ScreensharePicker.module.css";
import { type IPCSources, SourceCard } from "./SourceCard.jsx";

const {
ui: {
ModalRoot,
Expand Down Expand Up @@ -87,7 +89,7 @@ export const ScreensharePicker = (props: {
props.close();
}
return (
<ModalRoot size={ModalSizes.MEDIUM}>
<ModalRoot size={ModalSizes.MEDIUM} style="max-height: 90vh;">
<ModalHeader close={closeAndSave}>Screenshare</ModalHeader>
<ModalBody>
<div class={classes.sources}>
Expand All @@ -110,62 +112,71 @@ export const ScreensharePicker = (props: {
<Divider mt mb />
<div class={classes.qualityBox}>
<div>
<Header tag={HeaderTags.H4}>Resolution</Header>
<Dropdown
<Header class={classes.header} tag={HeaderTags.H4}>
Resolution
</Header>
<SegmentedControl
value={store.resolution}
onChange={(e) => {
store.resolution = Number(e.currentTarget.value);
}}
>
<option value="480">480p</option>
<option value="720">720p</option>
<option value="1080">1080p</option>
<option value="1440">1440p</option>
<option value="2160">2160p</option>
</Dropdown>
</div>
<div>
<Header tag={HeaderTags.H4}>FPS</Header>
<Dropdown
value={store.fps}
onChange={(e) => {
store.fps = Number(e.currentTarget.value);
onChange={(v) => {
store.resolution = Number(v);
}}
>
<option value="5">5</option>
<option value="15">15</option>
<option value="30">30</option>
<option value="60">60</option>
</Dropdown>
options={[
{ label: "480p", value: "480" },
{ label: "720p", value: "720" },
{ label: "1080p", value: "1080" },
{ label: "1440p", value: "1440" },
{ label: "2160p", value: "2160" },
]}
/>
</div>
<div>
<Show when={window.legcord.platform !== "darwin"}>
<Header tag={HeaderTags.H4}>Audio</Header>
<Header class={classes.header} tag={HeaderTags.H4}>
Audio
</Header>
<div class={classes.checkbox}>
<Checkbox checked={audio()} onChange={setAudio} />
</div>
</Show>
</div>
<div>
<Header class={classes.header} tag={HeaderTags.H4}>
FPS
</Header>
<SegmentedControl
value={store.fps}
onChange={(v) => {
store.fps = Number(v);
}}
options={[
{ label: "5", value: "5" },
{ label: "15", value: "15" },
{ label: "30", value: "30" },
{ label: "60", value: "60" },
]}
/>
</div>
</div>

<Show when={window.legcord.platform === "linux" && props.audioSources !== undefined && audio()}>
<Divider mt mb />
<Header tag={HeaderTags.H4}>Venmic</Header>
<Dropdown
value="Venmic disabled"
onChange={(e) => {
const source = props.audioSources!.find(
(node) => node["node.name"] === e.currentTarget.value,
);
onChange={(v) => {
const source = props.audioSources!.find((node) => node["node.name"] === v);
if (!source) return;
setAudioSource(source);
}}
>
<option value="Venmic disabled">Venmic disabled</option>
<For each={props.audioSources}>
{(source: Node) => <option value={source["node.name"]}>{source["node.name"]}</option>}
</For>
</Dropdown>
limitHeight
options={[
{ label: "Venmic disabled", value: "Venmic disabled" },
...(props.audioSources?.map((s) => ({
label: s["node.name"],
value: s["node.name"],
})) ?? []),
]}
/>
</Show>
</div>
</ModalBody>
Expand Down
Loading
Loading