From aed827812f2da24842e13b265584ae336ce0f564 Mon Sep 17 00:00:00 2001
From: sam edelsten <samedelsten1@gmail.com>
Date: Wed, 25 Oct 2023 20:44:56 +0100
Subject: [PATCH] hacky default scale to window scale
---
src/lib.rs | 10 +++++++---
src/render.rs | 15 ++++++++++++++-
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/lib.rs b/src/lib.rs
index a13ee14..63a0ab6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -21,7 +21,7 @@ use input::{input_kb, input_mouse, undo_redo, ClickTimer};
use input::{poll_wasm_paste, WasmPaste, WasmPasteAsyncChannel};
use render::{
blink_cursor, cosmic_edit_redraw_buffer, freeze_cursor_blink, hide_inactive_or_readonly_cursor,
- on_scale_factor_change, CursorBlinkTimer, CursorVisibility, SwashCacheState,
+ on_scale_factor_change, set_initial_scale, CursorBlinkTimer, CursorVisibility, SwashCacheState,
};
#[cfg(feature = "multicam")]
@@ -73,6 +73,8 @@ pub enum CosmicTextPosition {
pub struct CosmicTextChanged(pub (Entity, String));
// TODO docs
+const DEFAULT_SCALE_PLACEHOLDER: f32 = 0.6969690;
+
#[derive(Clone, Component)]
pub struct CosmicMetrics {
pub font_size: f32,
@@ -85,7 +87,7 @@ impl Default for CosmicMetrics {
Self {
font_size: 12.,
line_height: 12.,
- scale_factor: 1.,
+ scale_factor: DEFAULT_SCALE_PLACEHOLDER,
}
}
}
@@ -288,12 +290,14 @@ impl Plugin for CosmicEditPlugin {
app.add_systems(
First,
(
+ set_initial_scale,
cosmic_editor_builder,
placeholder_builder,
on_scale_factor_change,
render::cosmic_ui_to_canvas,
render::cosmic_sprite_to_canvas,
- ),
+ )
+ .chain(),
)
.add_systems(PreUpdate, (update_buffer_text, update_placeholder_text))
.add_systems(
diff --git a/src/render.rs b/src/render.rs
index cb585f6..e76e6d8 100644
--- a/src/render.rs
+++ b/src/render.rs
@@ -12,7 +12,7 @@ use image::{imageops::FilterType, GenericImageView};
use crate::{
get_text_size, get_x_offset_center, get_y_offset_center, CosmicAttrs, CosmicBackground,
CosmicCanvas, CosmicEditor, CosmicFontSystem, CosmicMetrics, CosmicMode, CosmicTextPosition,
- FillColor, Focus, Placeholder, ReadOnly, XOffset,
+ FillColor, Focus, Placeholder, ReadOnly, XOffset, DEFAULT_SCALE_PLACEHOLDER,
};
#[derive(Resource)]
@@ -430,6 +430,19 @@ pub(crate) fn hide_inactive_or_readonly_cursor(
}
}
+pub(crate) fn set_initial_scale(
+ window_q: Query<&Window, With<PrimaryWindow>>,
+ mut metrics_q: Query<&mut CosmicMetrics, Added<CosmicMetrics>>,
+) {
+ let scale = window_q.single().scale_factor() as f32;
+
+ for mut metrics in metrics_q.iter_mut() {
+ if metrics.scale_factor == DEFAULT_SCALE_PLACEHOLDER {
+ metrics.scale_factor = scale;
+ }
+ }
+}
+
pub(crate) fn on_scale_factor_change(
mut scale_factor_changed: EventReader<WindowScaleFactorChanged>,
mut cosmic_query: Query<(&mut CosmicEditor, &CosmicMetrics, &mut XOffset)>,
--
GitLab