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.

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

feat: reposition darwin traffic-lights in title bar #6102

Merged
merged 8 commits into from
Feb 5, 2025
Merged

feat: reposition darwin traffic-lights in title bar #6102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
72775fc
feat: reposition darwin traffic-lights in title bar
ndom91 Jan 28, 2025
aa6f94d
Make traffic-light adjustments possible for the main window on MacOS
Byron Jan 29, 2025
f96d1c9
feat: only apply traffic-light tauri plugin when v3 FF active
ndom91 Jan 29, 2025
9a30c77
feat: conditionally apply tauri-plugin-traffic-lights in v3 only
PavelLaptev Jan 29, 2025
b824b45
UI: traffic lights position updated
PavelLaptev Jan 29, 2025
306e467
Fix build on Linux
Byron Jan 30, 2025
bb9abcc
final touches for traffic lights
Byron Feb 5, 2025
8b9aec6
fix: eslint unused css class
ndom91 Feb 5, 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
Prev Previous commit
Next Next commit
UI: traffic lights position updated
  • Loading branch information
@PavelLaptev @ndom91
PavelLaptev authored and ndom91 committed Feb 5, 2025
commit b824b4599e0e4ac0e12902307116b41ee4104d6c
4 changes: 4 additions & 0 deletions apps/desktop/src/components/ChromeHeader.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@
padding: 14px 14px 14px 84px;
}

.traffic-lights-placeholder {
width: 58px;
}

.left {
display: flex;
gap: 14px;
Expand Down
4 changes: 2 additions & 2 deletions crates/gitbutler-tauri/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ fn main() {
if let Some(window) = tauri_app.get_window("main") {
#[cfg(target_os = "macos")]
// NOTE: Make sure you only call this ONCE per window.
window.setup_traffic_lights_inset(LogicalPosition::new(18.0, 22.0))?;
window.setup_traffic_lights_inset(LogicalPosition::new(16.0, 25.0))?;
};
}

Expand Down Expand Up @@ -167,7 +167,7 @@ fn main() {
#[cfg(target_os = "macos")]
// NOTE: Make sure you only call this ONCE per window.
window
.setup_traffic_lights_inset(LogicalPosition::new(20.0, 24.0))?;
.setup_traffic_lights_inset(LogicalPosition::new(16.0, 25.0))?;
};
}
}
Expand Down