Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflicts

Browse source
This commit is contained in:
Junkui Zhang 2025-08-25 22:18:27 +08:00
parent d6b334ceee
commit 899e79e226
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/settings_ui/src/keybindings.rs
View file

@ -14,9 +14,9 @@ use gpui::{
Action, AppContext as _, AsyncApp, Axis, ClickEvent, Context, DismissEvent, Entity, Action, AppContext as _, AsyncApp, Axis, ClickEvent, Context, DismissEvent, Entity,
EventEmitter, FocusHandle, Focusable, Global, IsZero, EventEmitter, FocusHandle, Focusable, Global, IsZero,
KeyBindingContextPredicate::{And, Descendant, Equal, Identifier, Not, NotEqual, Or}, KeyBindingContextPredicate::{And, Descendant, Equal, Identifier, Not, NotEqual, Or},
KeyContext, KeybindingKeystroke,Keystroke, MouseButton, Point, ScrollStrategy, ScrollWheelEvent, Stateful, KeyContext, KeybindingKeystroke, Keystroke, MouseButton, Point, ScrollStrategy,
StyledText, Subscription, Task, TextStyleRefinement, WeakEntity, actions, anchored, deferred, ScrollWheelEvent, Stateful, StyledText, Subscription, Task, TextStyleRefinement, WeakEntity,
div, actions, anchored, deferred, div,
}; };
use language::{Language, LanguageConfig, ToOffset as _}; use language::{Language, LanguageConfig, ToOffset as _};
use notifications::status_toast::{StatusToast, ToastIcon}; use notifications::status_toast::{StatusToast, ToastIcon};
@ -236,7 +236,7 @@ struct ConflictState {
} }
type ConflictKeybindMapping = HashMap< type ConflictKeybindMapping = HashMap<
Vec<Keystroke>, Vec<KeybindingKeystroke>,
Vec<( Vec<(
Option<gpui::KeyBindingContextPredicate>, Option<gpui::KeyBindingContextPredicate>,
Vec<ConflictOrigin>, Vec<ConflictOrigin>,

6
crates/ui/src/components/keybinding.rs
View file

@ -165,7 +165,7 @@ pub fn render_keybinding_keystroke(
if use_text { if use_text {
let element = Key::new( let element = Key::new(
keystroke_text( keystroke_text(
&keystroke.modifiers, &keystroke.display_modifiers,
&keystroke.display_key, &keystroke.display_key,
platform_style, platform_style,
vim_mode, vim_mode,
@ -178,7 +178,7 @@ pub fn render_keybinding_keystroke(
} else { } else {
let mut elements = Vec::new(); let mut elements = Vec::new();
elements.extend(render_modifiers( elements.extend(render_modifiers(
&keystroke.modifiers, &keystroke.display_modifiers,
platform_style, platform_style,
color, color,
size, size,
@ -418,7 +418,7 @@ pub fn text_for_keybinding_keystrokes(keystrokes: &[KeybindingKeystroke], cx: &A
.iter() .iter()
.map(|keystroke| { .map(|keystroke| {
keystroke_text( keystroke_text(
&keystroke.modifiers, &keystroke.display_modifiers,
&keystroke.display_key, &keystroke.display_key,
platform_style, platform_style,
vim_enabled, vim_enabled,