Skip to content
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.

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

Fixes for Windows, cross-platform copy, system theme... #179

Merged
merged 64 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
55b0e59
Fix rendering actors on non macos
ItsEeleeya Nov 21, 2024
2f6b39c
Exclude extended window frame from window bounds
ItsEeleeya Nov 21, 2024
c44152d
uncomment get_cursor_image_data
ItsEeleeya Nov 21, 2024
9187bbf
Use cross-platform solution for copying to clipboard
ItsEeleeya Nov 22, 2024
9d958de
Merge remote-tracking branch 'upstream/main' into next-windows
ItsEeleeya Nov 22, 2024
64f38f6
Fix missed issue during merge from upstream lib.rs
ItsEeleeya Nov 22, 2024
c48cb05
Don't unwrap on potential Err value in `fake_window`
ItsEeleeya Nov 23, 2024
730392c
Merge remote-tracking branch 'upstream/main' into next-windows
ItsEeleeya Nov 25, 2024
8312c2c
Merge branch 'CapSoftware:main' into next-windows
ItsEeleeya Nov 25, 2024
1f4264a
Use arboard for copy command
ItsEeleeya Nov 25, 2024
7600e5f
Fix checkUpgradedAndUpdate to not throw
ItsEeleeya Nov 25, 2024
04795bb
Add back Clipboard State
ItsEeleeya Nov 25, 2024
ef64af6
manage FakeWindowBounds state before use
ItsEeleeya Nov 25, 2024
262e23f
Improve Prev-recordings border radius (for Windows)
ItsEeleeya Nov 26, 2024
77f5fb0
Theme preview
ItsEeleeya Nov 26, 2024
466e4bd
Merge branch 'CapSoftware:main' into next-windows
ItsEeleeya Nov 26, 2024
184a417
Merge remote-tracking branch 'upstream/main' into next-windows
ItsEeleeya Nov 27, 2024
f3213ab
Update lib.rs
ItsEeleeya Nov 27, 2024
98ca06f
Update preview icons
ItsEeleeya Nov 27, 2024
dadaf6f
Merge branch 'CapSoftware:main' into next-windows
ItsEeleeya Nov 28, 2024
3001a0c
Merge branch 'next-windows' of https://github.com/ItsEeleeya/Cap into…
ItsEeleeya Nov 28, 2024
d67cb66
Implement theme change
ItsEeleeya Nov 28, 2024
fbf8d0b
Merge branch 'CapSoftware:main' into next-windows
ItsEeleeya Nov 29, 2024
5586a4d
Update auto theme preview and nsis sidebar banner
ItsEeleeya Nov 29, 2024
7053c2e
Merge branch 'next-windows' of https://github.com/ItsEeleeya/Cap into…
ItsEeleeya Nov 29, 2024
9ec100e
Merge branch 'CapSoftware:main' into next-windows
ItsEeleeya Nov 30, 2024
abf5521
Merge branch 'next-windows' of https://github.com/ItsEeleeya/Cap into…
ItsEeleeya Nov 30, 2024
654d18e
Theme fixes
ItsEeleeya Dec 1, 2024
15a6224
Merge remote-tracking branch 'upstream/main' into next-windows
ItsEeleeya Dec 1, 2024
60feb14
Cleanup theme handler, small adjustments
ItsEeleeya Dec 2, 2024
41196c7
Merge branch 'main' into next-windows
ItsEeleeya Dec 2, 2024
b7e2113
Remove plugin-clipboard-manager and use arboard directly
ItsEeleeya Dec 2, 2024
b6490c2
Use clipboard-rs instead
ItsEeleeya Dec 2, 2024
c23c008
Merge branch 'main' into next-windows
ItsEeleeya Dec 2, 2024
a16029a
Fix theme init, match Win11's exit caption buttons better
ItsEeleeya Dec 2, 2024
262aebc
Fix scrollbar styling, fix header text color in signin view
ItsEeleeya Dec 2, 2024
305a097
Hide scrollbar in prev-recordings
ItsEeleeya Dec 2, 2024
962e004
App progress for exporting video, cleanups
ItsEeleeya Dec 3, 2024
f44b2c5
Avoid styling the scrollbar on macos
ItsEeleeya Dec 3, 2024
67f1eca
Fix traffic lights losing their inset when changing the app theme
ItsEeleeya Dec 3, 2024
2121ff8
Update windows.rs
ItsEeleeya Dec 5, 2024
18caee7
Merge remote-tracking branch 'upstream/main' into next-windows
ItsEeleeya Dec 5, 2024
c4f2af6
Update pnpm-lock.yaml
ItsEeleeya Dec 5, 2024
95953a7
Request user attention when update is done
ItsEeleeya Dec 5, 2024
6d54273
Fix main logo clipping at the bottom and shifting when dark mode is on
ItsEeleeya Dec 5, 2024
3c85fff
Add macos-specific icon
ItsEeleeya Dec 5, 2024
aa1da7c
Merge remote-tracking branch 'upstream/main' into next-windows
ItsEeleeya Dec 5, 2024
709c661
Update update.tsx
ItsEeleeya Dec 5, 2024
25e86e8
Update pnpm-lock.yaml
ItsEeleeya Dec 5, 2024
25e4e4a
Merge branch 'main' into next-windows
Brendonovich Dec 6, 2024
ab6299f
typescript
Brendonovich Dec 6, 2024
780942d
Focus aware Windows titlebar
ItsEeleeya Dec 6, 2024
5f6551f
Fix render progress event
ItsEeleeya Dec 6, 2024
4506764
Update build preparation script. bump tauri-cli version to 2.1.0
ItsEeleeya Dec 7, 2024
9619bdd
Merge branch 'main' into next-windows
ItsEeleeya Dec 7, 2024
29dff5b
Revert "Update build preparation script. bump tauri-cli version to 2.…
ItsEeleeya Dec 8, 2024
8b04fd1
(Fixed) Improved preparation script + CI
ItsEeleeya Dec 8, 2024
83dead6
Fixed WIX upgrade codes, new wix banners
ItsEeleeya Dec 8, 2024
d447dd7
actually fix prod wix upgrade code to match ".exe.Cap.x64"
ItsEeleeya Dec 8, 2024
3affae3
fix show_window
Brendonovich Dec 9, 2024
6df1f55
Upgrade to tauri 2.1.1
ItsEeleeya Dec 9, 2024
8763820
Bump tauri plugins and tauri-build versions
ItsEeleeya Dec 9, 2024
c7ff615
better prepare.js logging
ItsEeleeya Dec 9, 2024
b8ee00f
Rename script `prepare` to `preparescript`
ItsEeleeya Dec 9, 2024
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
56 changes: 24 additions & 32 deletions .github/prebuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { fileURLToPath } from "node:url";
import { exec as execCb } from "node:child_process";
import { env } from "node:process";
import { promisify } from "node:util";
import { createTauriPlatformConfigs } from "../apps/desktop/scripts/prepare";

const exec = promisify(execCb);
const signId = env.APPLE_SIGNING_IDENTITY || "-";
Expand Down Expand Up @@ -63,40 +64,31 @@ rustflags = [
throw e;
});

await fs.writeFile(
`${srcTauri}/tauri.macos.conf.json`,
JSON.stringify(
{
bundle: {
macOS: {
frameworks: [path.join(nativeDeps, "Spacedrive.framework")],
},
},
createTauriPlatformConfigs("darwin", {
bundle: {
macOS: {
frameworks: [path.join(nativeDeps, "Spacedrive.framework")],
},
null,
4
)
);
},
});
} else if (os === "windows") {
const binFiles = await fs.readdir(path.join(nativeDeps, "bin"));

await fs.writeFile(
`${srcTauri}/tauri.windows.conf.json`,
JSON.stringify(
{
bundle: {
resources: binFiles.filter(
(f) =>
f.endsWith(".dll") && (f.startsWith("av") || f.startsWith("sw"))
),
},
},
null,
4
)
);

console.log();
// const binFiles = await fs.readdir(path.join(nativeDeps, "bin"));

// await fs.writeFile(
// `${srcTauri}/tauri.windows.conf.json`,
// JSON.stringify(
// {
// bundle: {
// resources: binFiles.filter(
// (f) =>
// f.endsWith(".dll") && (f.startsWith("av") || f.startsWith("sw"))
// ),
// },
// },
// null,
// 4
// )
// );
}
}

Expand Down
Loading
Loading