Skip to content

3 stacked in recording flow #1231

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

3 stacked in recording flow #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d08e588
3 stacked
oscartbeaumont Oct 17, 2025
03ccaee
prototype
oscartbeaumont Oct 17, 2025
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
4 changes: 2 additions & 2 deletions apps/desktop/src-tauri/src/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ use std::{
sync::{Arc, Mutex, atomic::AtomicU32},
};
use tauri::{
AppHandle, LogicalPosition, Manager, Monitor, PhysicalPosition, PhysicalSize, WebviewUrl,
WebviewWindow, WebviewWindowBuilder, Wry,
AppHandle, LogicalPosition, LogicalSize, Manager, Monitor, PhysicalPosition, PhysicalSize,
WebviewUrl, WebviewWindow, WebviewWindowBuilder, Wry,
};
use tauri_specta::Event;
use tokio::sync::RwLock;
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/routes/(window-chrome)/new-main/CameraSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function CameraSelect(props: {
<div class="flex flex-col gap-[0.25rem] items-stretch text-[--text-primary]">
<button
disabled={!!currentRecording.data || props.disabled}
class="flex flex-row gap-2 items-center px-2 w-full h-9 rounded-lg transition-colors cursor-default disabled:opacity-70 bg-gray-3 disabled:text-gray-11 KSelect"
class="flex flex-row gap-2 items-center px-2 w-full h-11 rounded-lg transition-colors cursor-default disabled:opacity-70 bg-gray-3 disabled:text-gray-11 KSelect"
onClick={() => {
Promise.all([
CheckMenuItem.new({
Expand Down
6 changes: 3 additions & 3 deletions apps/desktop/src/routes/(window-chrome)/new-main/TargetMenuGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default function TargetMenuGrid(props: TargetMenuGridProps) {
<div
data-variant={props.variant}
class={cx(
"grid w-full grid-cols-2 content-start items-start justify-items-stretch gap-2",
"grid w-full grid-cols-3 content-start items-start justify-items-stretch gap-2",
props.class,
)}
ref={(node) => {
Expand All @@ -112,7 +112,7 @@ export default function TargetMenuGrid(props: TargetMenuGridProps) {
>
<Switch>
<Match when={props.errorMessage}>
<div class="flex flex-col col-span-2 gap-2 justify-center items-center py-6 text-sm text-center text-gray-11">
<div class="flex flex-col col-span-3 gap-2 justify-center items-center py-6 text-sm text-center text-gray-11">
<p>{props.errorMessage}</p>
</div>
</Match>
Expand All @@ -122,7 +122,7 @@ export default function TargetMenuGrid(props: TargetMenuGridProps) {
</For>
</Match>
<Match when={isEmpty()}>
<div class="col-span-2 py-6 text-sm text-center text-gray-11">
<div class="col-span-3 py-6 text-sm text-center text-gray-11">
{props.emptyMessage ?? defaultEmptyMessage()}
</div>
</Match>
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/routes/(window-chrome)/new-main/TargetTypeButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function TargetTypeButton(props: TargetTypeButtonProps) {
disabled={local.disabled}
aria-pressed={local.selected ? "true" : "false"}
class={cx(
"flex flex-1 flex-col items-center justify-end gap-2 rounded-lg bg-gray-3 py-1.5 text-center transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-9 focus-visible:ring-offset-2 focus-visible:ring-offset-gray-1",
"flex flex-1 flex-col items-center justify-center gap-3 rounded-lg bg-gray-3 py-6 text-center transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-9 focus-visible:ring-offset-2 focus-visible:ring-offset-gray-1 min-h-0",
local.selected ? "text-gray-12" : "text-gray-12 hover:bg-gray-4",
local.disabled && "pointer-events-none opacity-60",
local.class,
Expand Down
14 changes: 7 additions & 7 deletions apps/desktop/src/routes/(window-chrome)/new-main/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ import TargetTypeButton from "./TargetTypeButton";

function getWindowSize() {
return {
width: 270,
height: 256,
width: 320,
height: 300,
};
}

Expand Down Expand Up @@ -195,8 +195,8 @@ function TargetMenuPanel(props: TargetMenuPanelProps & SharedTargetMenuProps) {
<div class="flex gap-3 justify-between items-center mt-3">
<div
onClick={() => props.onBack()}
class="flex gap-1 items-center rounded-md px-1.5 text-xs
text-gray-11 transition-opacity hover:opacity-70 hover:text-gray-12
class="flex gap-1 items-center rounded-md px-1.5 text-xs
text-gray-11 transition-opacity hover:opacity-70 hover:text-gray-12
focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-9 focus-visible:ring-offset-2 focus-visible:ring-offset-gray-1"
>
<IconLucideArrowLeft class="size-3 text-gray-11" />
Expand Down Expand Up @@ -631,7 +631,7 @@ function Page() {
exitClass="scale-100"
exitToClass="scale-95"
>
<div class="flex flex-col gap-2 w-full">
<div class="flex flex-col w-full space-y-2">
<div class="flex flex-row gap-2 items-stretch w-full text-xs text-gray-11">
<div
class={cx(
Expand All @@ -655,7 +655,7 @@ function Page() {
/>
<TargetDropdownButton
class={cx(
"rounded-none border-l border-gray-6 focus-visible:ring-0 focus-visible:ring-offset-0",
"rounded-none border-l border-gray-6 focus-visible:ring-0 focus-visible:ring-offset-0 h-full",
displayMenuOpen() && "bg-gray-5",
)}
ref={(el) => (displayTriggerRef = el)}
Expand Down Expand Up @@ -697,7 +697,7 @@ function Page() {
/>
<TargetDropdownButton
class={cx(
"rounded-none border-l border-gray-6 focus-visible:ring-0 focus-visible:ring-offset-0",
"rounded-none border-l border-gray-6 focus-visible:ring-0 focus-visible:ring-offset-0 h-full",
windowMenuOpen() && "bg-gray-5",
)}
ref={(el) => (windowTriggerRef = el)}
Expand Down
Loading