Skip to content

Add UI_FONT_SIZE const in editor #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrDIMAS merged 6 commits into from
Apr 30, 2026
+20 −2
Merged

Add UI_FONT_SIZE const in editor #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c7f328
Added `UI_FONT_SIZE` const in Editor, prerequisite for font size
Apr 25, 2026
bb22b1e
Added `fn set_style()` for FormattedText
Apr 25, 2026
1176ac0
Fixes clippy warning
Apr 28, 2026
c975473
Merge branch 'FyroxEngine:master' into use_unique_key_for_editor_fonts
CopeFiend Apr 29, 2026
7f49838
Add WidgetMessage:Style handling to TextBox
Apr 30, 2026
959eff7
Merge remote-tracking branch 'upstream/master' into use_unique_key_fo…
Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions editor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,8 @@ fn make_light_style() -> StyleResource {
}

impl Editor {
pub const UI_FONT_SIZE: &'static str = "Editor.UI.Font.Size";

pub fn new(startup_data: Option<StartupData>) -> Self {
Self::new_with_settings(startup_data, Default::default())
}
Expand Down
8 changes: 7 additions & 1 deletion fyrox-ui/src/formatted_text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use crate::{
variable::InheritableVariable, visitor::prelude::*,
},
font::{Font, FontGlyph, FontHeight, FontResource, BUILT_IN_FONT},
style::StyledProperty,
style::{resource::StyleResource, StyledProperty},
HorizontalAlignment, Thickness, VerticalAlignment,
};
use fyrox_resource::state::{LoadError, ResourceState};
Expand Down Expand Up @@ -727,6 +727,12 @@ impl FormattedText {
self
}

/// Sets desired style.
pub fn set_style(&mut self, style: &StyleResource) -> &mut Self {
self.font_size.update(style);
self
}

/// Runs can optionally modify various style settings for portions of the text.
/// Later runs override earlier runs if their ranges overlap and the later run
/// sets a property that conflicts with an earlier run.
Expand Down
8 changes: 7 additions & 1 deletion fyrox-ui/src/text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ use crate::{
style::{resource::StyleResourceExt, Style, StyledProperty},
widget::{Widget, WidgetBuilder},
BBCode, BuildContext, Control, HorizontalAlignment, UiNode, UserInterface, VerticalAlignment,
WidgetMessage,
};
use fyrox_core::algebra::Matrix3;
use fyrox_core::variable::InheritableVariable;
Expand Down Expand Up @@ -401,7 +402,12 @@ impl Control for Text {
self.widget.handle_routed_message(ui, message);

if message.destination() == self.handle() {
if let Some(msg) = message.data::<TextMessage>() {
if let Some(msg) = message.data::<WidgetMessage>() {
if let WidgetMessage::Style(style) = msg {
self.formatted_text.borrow_mut().set_style(style);
self.invalidate_layout();
}
} else if let Some(msg) = message.data::<TextMessage>() {
let mut text_ref = self.formatted_text.borrow_mut();
match msg {
TextMessage::BBCode(text) => {
Expand Down
4 changes: 4 additions & 0 deletions fyrox-ui/src/text_box.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,10 @@ impl Control for TextBox {
self.selecting = false;
ui.release_mouse_capture();
}
WidgetMessage::Style(style) => {
self.formatted_text.borrow_mut().set_style(style);
self.invalidate_layout();
}
_ => {}
}
} else if let Some(msg) = message.data::<TextMessage>() {
Expand Down
Loading