Skip to content
Snippets Groups Projects
Commit 5c277869 authored by sam edelsten's avatar sam edelsten
Browse files

revert 70a53888

fix didnt work, no need to keep the over complicated function
parent 58008c33
No related branches found
No related tags found
No related merge requests found
...@@ -463,34 +463,16 @@ pub(crate) fn hide_inactive_or_readonly_cursor( ...@@ -463,34 +463,16 @@ pub(crate) fn hide_inactive_or_readonly_cursor(
pub(crate) fn set_initial_scale( pub(crate) fn set_initial_scale(
window_q: Query<&Window, With<PrimaryWindow>>, window_q: Query<&Window, With<PrimaryWindow>>,
mut cosmic_query: Query< mut cosmic_query: Query<&mut CosmicMetrics, Added<CosmicMetrics>>,
(
Option<&mut CosmicEditor>,
&mut CosmicMetrics,
Option<&mut XOffset>,
),
Added<CosmicMetrics>,
>,
mut font_system: ResMut<CosmicFontSystem>,
) { ) {
let scale = window_q.single().scale_factor() as f32; let scale = window_q.single().scale_factor() as f32;
for (editor, mut metrics, x_offset) in &mut cosmic_query.iter_mut() { for mut metrics in &mut cosmic_query.iter_mut() {
if metrics.scale_factor != DEFAULT_SCALE_PLACEHOLDER { if metrics.scale_factor != DEFAULT_SCALE_PLACEHOLDER {
continue; continue;
} }
let font_system = &mut font_system.0;
metrics.scale_factor = scale; metrics.scale_factor = scale;
let metrics = Metrics::new(metrics.font_size, metrics.line_height).scale(scale);
if let Some(mut editor) = editor {
editor.0.buffer_mut().set_metrics(font_system, metrics);
editor.0.buffer_mut().set_redraw(true);
}
if let Some(mut x_offset) = x_offset {
*x_offset = XOffset(None);
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment