Skip to content

Commit 6b61ccd

Browse files
author
CopeFiend
committed
Added editor font size update
1 parent 8bbfe2b commit 6b61ccd

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

editor/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2784,6 +2784,11 @@ impl Editor {
27842784
ui.set_style(style.clone());
27852785
}
27862786
}
2787+
2788+
let font_size = self.settings.general.ui_font_size;
2789+
if font_size != ui.font_size {
2790+
ui.set_font_size(font_size);
2791+
}
27872792
}
27882793
}
27892794

fyrox-ui/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ pub struct UserInterface {
728728
z_index_update_set: FxHashSet<Handle<UiNode>>,
729729
#[reflect(hidden)]
730730
pub default_font: FontResource,
731-
pub default_font_size: f32,
731+
pub font_size: f32,
732732
#[reflect(hidden)]
733733
double_click_entries: FxHashMap<MouseButton, DoubleClickEntry>,
734734
pub double_click_time_slice: f32,
@@ -774,7 +774,7 @@ impl Debug for UserInterface {
774774
.field("layout_events_sender", &self.layout_events_sender)
775775
.field("z_index_update_set", &self.z_index_update_set)
776776
.field("default_font", &self.default_font)
777-
.field("default_font_size", &self.default_font_size)
777+
.field("font_size", &self.font_size)
778778
.field("double_click_entries", &self.double_click_entries)
779779
.field("double_click_time_slice", &self.double_click_time_slice)
780780
.field("tooltip_appear_delay", &self.tooltip_appear_delay)
@@ -873,7 +873,7 @@ impl Clone for UserInterface {
873873
layout_events_sender,
874874
z_index_update_set: self.z_index_update_set.clone(),
875875
default_font: self.default_font.clone(),
876-
default_font_size: self.default_font_size,
876+
font_size: self.font_size,
877877
double_click_entries: self.double_click_entries.clone(),
878878
double_click_time_slice: self.double_click_time_slice,
879879
tooltip_appear_delay: self.tooltip_appear_delay,
@@ -1192,7 +1192,7 @@ impl UserInterface {
11921192
layout_events_sender,
11931193
z_index_update_set: Default::default(),
11941194
default_font: BUILT_IN_FONT.resource(),
1195-
default_font_size: 14.0,
1195+
font_size: 14.0,
11961196
double_click_entries: Default::default(),
11971197
double_click_time_slice: 0.5, // 500 ms is standard in most operating systems.
11981198
tooltip_appear_delay: 0.55,
@@ -1541,15 +1541,15 @@ impl UserInterface {
15411541
}
15421542

15431543
pub fn set_font_size(&mut self, font_size: f32) {
1544-
self.default_font_size = font_size;
1544+
self.font_size = font_size;
15451545

15461546
fn notify_depth_first(node: Handle<UiNode>, ui: &UserInterface) {
15471547
if let Ok(node_ref) = ui.try_get_node(node) {
15481548
for child in node_ref.children.iter() {
15491549
notify_depth_first(*child, ui);
15501550
}
15511551

1552-
ui.send(node, TextMessage::FontSize(ui.default_font_size.into()));
1552+
ui.send(node, TextMessage::FontSize(ui.font_size.into()));
15531553
}
15541554
}
15551555

0 commit comments

Comments
 (0)