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

Do not react on settings change for disabled minimaps (#31677)

Browse source 
Turning minimap on during debug sessions would cause the console editor
to gain the minimap, despite it being explicitly disabled in the code.

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2025-05-29 13:04:27 +03:00 • committed by GitHub
parent ae076fa415
commit d989b2260b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/editor/src/editor.rs
View file

@ -18635,16 +18635,20 @@ impl Editor {
}
let minimap_settings = EditorSettings::get_global(cx).minimap;
if self.minimap_visibility.settings_visibility() != minimap_settings.minimap_enabled() {
self.set_minimap_visibility(
MinimapVisibility::for_mode(self.mode(), cx),
window,
cx,
);
} else if let Some(minimap_entity) = self.minimap.as_ref() {
minimap_entity.update(cx, |minimap_editor, cx| {
minimap_editor.update_minimap_configuration(minimap_settings, cx)
})
if self.minimap_visibility != MinimapVisibility::Disabled {
if self.minimap_visibility.settings_visibility()
!= minimap_settings.minimap_enabled()
{
self.set_minimap_visibility(
MinimapVisibility::for_mode(self.mode(), cx),
window,
cx,
);
} else if let Some(minimap_entity) = self.minimap.as_ref() {
minimap_entity.update(cx, |minimap_editor, cx| {
minimap_editor.update_minimap_configuration(minimap_settings, cx)
})
}
}
}