Skip to content

git: Add click with modifier to set default for side-by-side diff toolbar buttons #48908

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
cole-miller merged 2 commits into from
Feb 11, 2026
Merged

git: Add click with modifier to set default for side-by-side diff toolbar buttons #48908

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
b708f0b
implement
cole-miller Feb 11, 2026
76c435c
clippy
cole-miller Feb 11, 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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions crates/search/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ bitflags.workspace = true
collections.workspace = true
editor.workspace = true
feature_flags.workspace = true
fs.workspace = true
futures.workspace = true
gpui.workspace = true
language.workspace = true
Expand Down
96 changes: 78 additions & 18 deletions crates/search/src/buffer_search.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,15 @@ use project::{
search_history::{SearchHistory, SearchHistoryCursor},
};

use settings::Settings;
use fs::Fs;
use settings::{DiffViewStyle, Settings, update_settings_file};
use std::{any::TypeId, sync::Arc};
use zed_actions::{outline::ToggleOutline, workspace::CopyPath, workspace::CopyRelativePath};

use ui::{BASE_REM_SIZE_IN_PX, IconButtonShape, Tooltip, prelude::*, utils::SearchInputWidth};
use ui::{
BASE_REM_SIZE_IN_PX, IconButtonShape, PlatformStyle, TextSize, Tooltip, prelude::*,
render_modifiers, utils::SearchInputWidth,
};
use util::{ResultExt, paths::PathMatcher};
use workspace::{
ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace,
Expand Down Expand Up @@ -118,33 +122,89 @@ impl Render for BufferSearchBar {
IconButton::new("diff-stacked", IconName::DiffStacked)
.shape(IconButtonShape::Square)
.toggle_state(!is_split)
.tooltip(|_, cx| {
Tooltip::for_action("Stacked", &ToggleDiffView, cx)
})
.when(is_split, |button| {
.tooltip(Tooltip::element(move |_, cx| {
v_flex()
.gap_1()
.child(Label::new("Stacked"))
.child(
h_flex()
.gap_0p5()
.text_sm()
.text_color(Color::Muted.color(cx))
.children(render_modifiers(
&gpui::Modifiers::secondary_key(),
PlatformStyle::platform(),
None,
Some(TextSize::Default.rems(cx).into()),
false,
))
.child("click to set as default"),
)
.into_any()
}))
.on_click({
let focus_handle = focus_handle.clone();
button.on_click(move |_, window, cx| {
focus_handle.focus(window, cx);
window.dispatch_action(ToggleDiffView.boxed_clone(), cx);
})
move |_, window, cx| {
if window.modifiers().secondary() {
update_settings_file(
<dyn Fs>::global(cx),
cx,
|settings, _| {
settings.editor.diff_view_style =
Some(DiffViewStyle::Stacked);
},
);
}
if is_split {
focus_handle.focus(window, cx);
window
.dispatch_action(ToggleDiffView.boxed_clone(), cx);
}
}
}),
)
.child(
IconButton::new("diff-split", IconName::DiffSplit)
.shape(IconButtonShape::Square)
.toggle_state(is_split)
.tooltip(|_, cx| {
Tooltip::for_action("Side by Side", &ToggleDiffView, cx)
})
.when(!is_split, |button| {
button.on_click({
let focus_handle = focus_handle.clone();
move |_, window, cx| {
.tooltip(Tooltip::element(move |_, cx| {
v_flex()
.gap_1()
.child(Label::new("Side by Side"))
.child(
h_flex()
.gap_0p5()
.text_sm()
.text_color(Color::Muted.color(cx))
.children(render_modifiers(
&gpui::Modifiers::secondary_key(),
PlatformStyle::platform(),
None,
Some(TextSize::Default.rems(cx).into()),
false,
))
.child("click to set as default"),
)
.into_any()
}))
.on_click({
move |_, window, cx| {
if window.modifiers().secondary() {
update_settings_file(
<dyn Fs>::global(cx),
cx,
|settings, _| {
settings.editor.diff_view_style =
Some(DiffViewStyle::SideBySide);
},
);
}
if !is_split {
focus_handle.focus(window, cx);
window
.dispatch_action(ToggleDiffView.boxed_clone(), cx);
}
})
}
}),
)
})
Expand Down
Loading