Skip to content

Fix Layout #410

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
Kitenite merged 1 commit into from
Dec 18, 2025
Merged

Fix Layout #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 18 additions & 20 deletions ...derer/screens/main/components/WorkspaceView/ContentView/ChangesContent/ChangesContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,28 +133,26 @@ export function ChangesContent() {

return (
<>
<div className="flex-1 h-full flex flex-col bg-tertiary rounded-lg">
<div className="flex flex-col h-full bg-background m-2 rounded-lg overflow-hidden">
<FileHeader file={selectedFile} worktreePath={worktreePath} />
<DiffToolbar
<div className="flex flex-col h-full overflow-hidden">
<FileHeader file={selectedFile} worktreePath={worktreePath} />
<DiffToolbar
viewMode={viewMode}
onViewModeChange={setViewMode}
category={selectedCategory}
onStage={isUnstaged ? stage : undefined}
onUnstage={isStaged ? unstage : undefined}
onDiscard={isUnstaged ? handleDiscard : undefined}
isActioning={isPending}
isEditable={isEditable}
isSaving={saveFileMutation.isPending}
/>
<div className="flex-1">
<DiffViewer
contents={contents}
viewMode={viewMode}
onViewModeChange={setViewMode}
category={selectedCategory}
onStage={isUnstaged ? stage : undefined}
onUnstage={isStaged ? unstage : undefined}
onDiscard={isUnstaged ? handleDiscard : undefined}
isActioning={isPending}
isEditable={isEditable}
isSaving={saveFileMutation.isPending}
editable={isEditable}
onSave={handleSave}
/>
<div className="flex-1">
<DiffViewer
contents={contents}
viewMode={viewMode}
editable={isEditable}
onSave={handleSave}
/>
</div>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion .../components/WorkspaceView/ContentView/ChangesContent/components/EmptyState/EmptyState.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface EmptyStateProps {

export function EmptyState({ title, description }: EmptyStateProps) {
return (
<div className="flex-1 flex flex-col items-center justify-center text-muted-foreground px-4">
<div className="flex-1 flex flex-col items-center justify-center text-muted-foreground px-4 h-full">
<HiOutlineDocumentMagnifyingGlass className="w-12 h-12 mb-4 opacity-50" />
<h3 className="text-lg font-medium mb-1">{title}</h3>
{description && (
Expand Down
12 changes: 2 additions & 10 deletions ...ktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,8 @@ export function TabsContent() {
}, [activeWorkspaceId, activeTabIds, allTabs]);

if (!tabToRender) {
return (
<div className="flex-1 h-full">
<EmptyTabView />
</div>
);
return <EmptyTabView />;
}

return (
<div className="flex-1 h-full">
<TabView tab={tabToRender} panes={panes} />
</div>
);
return <TabView tab={tabToRender} panes={panes} />;
}
8 changes: 7 additions & 1 deletion apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ export function ContentView() {
const { currentMode } = useSidebarStore();

if (currentMode === SidebarMode.Changes) {
return <ChangesContent />;
return (
<div className="h-full p-1 bg-tertiary">
<div className="h-full bg-background rounded-lg">
<ChangesContent />
</div>
</div>
);
}

return <TabsContent />;
Expand Down