Skip to content

Add editor font size settings #911

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

Draft
CopeFiend wants to merge 24 commits into
base: master
Choose a base branch
from
Draft

Add editor font size settings #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
54e4c8d
Added ui font size config values
Apr 12, 2026
0e80df2
Updated UI implementation for font size config
Apr 12, 2026
8f65dd2
Added editor font size update
Apr 12, 2026
e5355d0
Clamped to ui_font_size settings (8.0 - 48.0, whole number only)
Apr 13, 2026
686249b
Added documentation for ui_font_size
Apr 13, 2026
36245f9
Reverted changes to editor and UI code
Apr 13, 2026
2bbf2ff
Added style font_size updates in editor
Apr 13, 2026
69f6051
Fixed style update order
Apr 14, 2026
0346259
Figuring things out
Apr 15, 2026
61e6ecd
Added `pub const UI_FONT_SIZE` to Editor, added `fn set_style` to For…
Apr 18, 2026
106e78f
Added font size update to Asset Browser/No Items Message
Apr 18, 2026
52dafb6
Added font size update to WindowTitle (most of them)
Apr 18, 2026
3c2fac5
Added font size update to MenuItem
Apr 19, 2026
d19504e
Added font size update to Buttons (most of them)
Apr 19, 2026
0d34aea
Added font size update for Menus/FileBrowsers/FileSelectors
Apr 19, 2026
e1c186f
Added FolderNameDialogBuilder
Apr 20, 2026
3a3ccba
Added font/font_size to ItemContextMenu, added font size update to
Apr 20, 2026
6b4e9cc
Added font size update to Inspectors
Apr 25, 2026
3e4c68e
Updated Flakes
Apr 25, 2026
c16f442
Added font/font_size update to PropertyEditors
Apr 26, 2026
9d04160
Added font_size update to FsTree
Apr 29, 2026
9054be9
Added font_size update to dropdown list items
Apr 29, 2026
0b55f8c
Updated Flakes
Apr 30, 2026
cd608bd
Updated Flakes
May 6, 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
24 changes: 20 additions & 4 deletions editor/src/asset/creator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use crate::{
list_view::{ListViewBuilder, ListViewMessage},
message::UiMessage,
stack_panel::StackPanelBuilder,
style::resource::StyleResourceExt,
text::TextMessage,
text_box::TextBoxBuilder,
utils::make_dropdown_list_option,
Expand All @@ -41,7 +42,7 @@ use crate::{
},
},
message::MessageSender,
Message,
Editor, Message,
};
use fyrox::gui::button::Button;
use fyrox::gui::list_view::ListView;
Expand Down Expand Up @@ -73,6 +74,8 @@ impl ResourceCreator {
items.push(make_dropdown_list_option(
ctx,
make_pretty_type_name(&constructor.type_name),
ctx.default_font(),
ctx.style.property(Editor::UI_FONT_SIZE),
))
}
}
Expand All @@ -83,7 +86,11 @@ impl ResourceCreator {
let cancel;
let resource_constructors_list;
let window = WindowBuilder::new(WidgetBuilder::new().with_width(300.0).with_height(400.0))
.with_title(WindowTitle::text("Resource Creator"))
.with_title(WindowTitle::text_with_font_size(
"Resource Creator",
ctx.default_font(),
ctx.style.property(Editor::UI_FONT_SIZE),
))
.open(false)
.with_content(
GridBuilder::new(
Expand All @@ -97,6 +104,7 @@ impl ResourceCreator {
.with_margin(Thickness::uniform(1.0)),
)
.with_text(&name_str)
.with_font_size(ctx.style.property(Editor::UI_FONT_SIZE))
.build(ctx);
name
})
Expand All @@ -121,7 +129,11 @@ impl ResourceCreator {
.with_width(100.0)
.with_height(22.0),
)
.with_text("OK")
.with_text_and_font_size(
"OK",
ctx.default_font(),
ctx.style.property(Editor::UI_FONT_SIZE),
)
.build(ctx);
ok
})
Expand All @@ -132,7 +144,11 @@ impl ResourceCreator {
.with_width(100.0)
.with_height(22.0),
)
.with_text("Cancel")
.with_text_and_font_size(
"Cancel",
ctx.default_font(),
ctx.style.property(Editor::UI_FONT_SIZE),
)
.build(ctx);
cancel
}),
Expand Down
62 changes: 39 additions & 23 deletions editor/src/asset/dependency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,34 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.

use crate::fyrox::{
asset::{
graph::{ResourceDependencyGraph, ResourceGraphNode},
untyped::UntypedResource,
},
core::{log::Log, pool::Handle},
gui::{
button::{ButtonBuilder, ButtonMessage},
copypasta::ClipboardProvider,
grid::{Column, GridBuilder, Row},
message::UiMessage,
scroll_viewer::ScrollViewerBuilder,
stack_panel::StackPanelBuilder,
text::TextBuilder,
tree::{TreeBuilder, TreeRootBuilder, TreeRootMessage},
widget::WidgetBuilder,
window::{WindowBuilder, WindowMessage, WindowTitle},
BuildContext, HorizontalAlignment, Orientation, Thickness, UserInterface,
VerticalAlignment,
use crate::{
fyrox::{
asset::{
graph::{ResourceDependencyGraph, ResourceGraphNode},
untyped::UntypedResource,
},
core::{log::Log, pool::Handle},
gui::{
button::{ButtonBuilder, ButtonMessage},
copypasta::ClipboardProvider,
grid::{Column, GridBuilder, Row},
message::UiMessage,
scroll_viewer::ScrollViewerBuilder,
stack_panel::StackPanelBuilder,
text::TextBuilder,
tree::{TreeBuilder, TreeRootBuilder, TreeRootMessage},
widget::WidgetBuilder,
window::{WindowBuilder, WindowMessage, WindowTitle},
BuildContext, HorizontalAlignment, Orientation, Thickness, UserInterface,
VerticalAlignment,
},
},
Editor,
};
use fyrox::asset::manager::ResourceManager;
use fyrox::gui::button::Button;
use fyrox::gui::tree::{Tree, TreeRoot};
use fyrox::gui::window::{Window, WindowAlignment};
use fyrox::{asset::manager::ResourceManager, gui::style::resource::StyleResourceExt};

pub struct DependencyViewer {
pub window: Handle<Window>,
Expand Down Expand Up @@ -77,6 +80,7 @@ fn build_tree_recursively(
WidgetBuilder::new().with_vertical_alignment(VerticalAlignment::Center),
)
.with_text(format!("{name} ({data_type})"))
.with_font_size(ctx.style.property(Editor::UI_FONT_SIZE))
.build(ctx),
)
.build(ctx)
Expand All @@ -89,7 +93,11 @@ impl DependencyViewer {
let close;
let window = WindowBuilder::new(WidgetBuilder::new().with_width(300.0).with_height(400.0))
.open(false)
.with_title(WindowTitle::text("Dependency Viewer"))
.with_title(WindowTitle::text_with_font_size(
"Dependency Viewer",
ctx.default_font(),
ctx.style.property(Editor::UI_FONT_SIZE),
))
.with_content(
GridBuilder::new(
WidgetBuilder::new()
Expand All @@ -116,7 +124,11 @@ impl DependencyViewer {
.with_width(130.0)
.with_margin(Thickness::uniform(1.0)),
)
.with_text("Copy To Clipboard")
.with_text_and_font_size(
"Copy To Clipboard",
ctx.default_font(),
ctx.style.property(Editor::UI_FONT_SIZE),
)
.build(ctx);
copy_to_clipboard
})
Expand All @@ -126,7 +138,11 @@ impl DependencyViewer {
.with_width(130.0)
.with_margin(Thickness::uniform(1.0)),
)
.with_text("Close")
.with_text_and_font_size(
"Close",
ctx.default_font(),
ctx.style.property(Editor::UI_FONT_SIZE),
)
.build(ctx);
close
}),
Expand Down
4 changes: 3 additions & 1 deletion editor/src/asset/item.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ use crate::{
scene::tilemap::{brush::TileMapBrush, tileset::TileSet},
},
message::MessageSender,
Message,
Editor, Message,
};
use fyrox::core::ok_or_return;
use fyrox::gui::border::Border;
Expand Down Expand Up @@ -357,6 +357,7 @@ fn make_tooltip(ctx: &mut BuildContext, text: &str) -> RcUiNodeHandle {
)
.with_wrap(WrapMode::Letter)
.with_text(text)
.with_font_size(ctx.style.property(Editor::UI_FONT_SIZE))
.build(ctx),
),
)
Expand Down Expand Up @@ -421,6 +422,7 @@ impl AssetItemBuilder {
.to_string(),
)
.with_shadow(true)
.with_font_size(ctx.style.property(Editor::UI_FONT_SIZE))
.build(ctx),
),
)
Expand Down
57 changes: 45 additions & 12 deletions editor/src/asset/menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,14 @@ use crate::{
fyrox::{
asset::manager::ResourceManager,
core::{
futures::executor::block_on, log::Log, ok_or_return, pool::Handle,
pool::HandlesVecExtension, reflect::prelude::*, type_traits::prelude::*,
visitor::prelude::*, SafeLock,
futures::executor::block_on,
log::Log,
ok_or_return,
pool::{Handle, HandlesVecExtension},
reflect::prelude::*,
type_traits::prelude::*,
visitor::prelude::*,
SafeLock,
},
engine::Engine,
graph::SceneGraph,
Expand All @@ -44,6 +49,7 @@ use crate::{
},
popup::{Placement, PopupBuilder, PopupMessage},
stack_panel::StackPanelBuilder,
style::resource::StyleResourceExt,
text::{TextBuilder, TextMessage},
text_box::{TextBox, TextBoxBuilder, TextCommitMode},
widget::{Widget, WidgetBuilder, WidgetMessage},
Expand All @@ -53,7 +59,7 @@ use crate::{
},
},
message::MessageSender,
Message,
Editor, Message,
};
use std::{
fs::File,
Expand Down Expand Up @@ -163,6 +169,7 @@ impl AssetRenameDialogBuilder {
"Enter a new name for {old_file_name}.{extension} resource."
))
.with_wrap(WrapMode::Word)
.with_font_size(ctx.style.property(Editor::UI_FONT_SIZE))
.build(ctx),
)
.with_child({
Expand All @@ -174,6 +181,7 @@ impl AssetRenameDialogBuilder {
)
.with_text(&old_file_name)
.with_text_commit_mode(TextCommitMode::Immediate)
.with_font_size(ctx.style.property(Editor::UI_FONT_SIZE))
.build(ctx);
name_field
})
Expand All @@ -190,7 +198,11 @@ impl AssetRenameDialogBuilder {
.with_height(24.0)
.with_tab_index(Some(1)),
)
.with_text("Rename")
.with_text_and_font_size(
"Rename",
ctx.default_font(),
ctx.style.property(Editor::UI_FONT_SIZE),
)
.build(ctx);
rename
})
Expand All @@ -202,7 +214,11 @@ impl AssetRenameDialogBuilder {
.with_height(24.0)
.with_tab_index(Some(2)),
)
.with_text("Cancel")
.with_text_and_font_size(
"Cancel",
ctx.default_font(),
ctx.style.property(Editor::UI_FONT_SIZE),
)
.build(ctx);
cancel
}),
Expand Down Expand Up @@ -256,6 +272,7 @@ impl AssetItemContextMenu {
fn item(text: &str, ctx: &mut BuildContext) -> Handle<MenuItem> {
MenuItemBuilder::new(WidgetBuilder::new())
.with_content(MenuItemContent::text(text))
.with_font_size(ctx.style.property(Editor::UI_FONT_SIZE))
.build(ctx)
}

Expand Down Expand Up @@ -365,9 +382,15 @@ impl AssetItemContextMenu {
)
.open(false)
.with_remove_on_close(true)
.with_title(WindowTitle::text("Confirm Deletion")),
.with_title(WindowTitle::text_with_font_size(
"Confirm Deletion",
ui.default_font.clone(),
ui.style.property(Editor::UI_FONT_SIZE),
)),
)
.with_text(&text)
.with_font(ui.default_font.clone())
.with_font_size(ui.style.property(Editor::UI_FONT_SIZE))
.with_buttons(MessageBoxButtons::YesNo)
.build(&mut ui.build_ctx());

Expand Down Expand Up @@ -494,19 +517,29 @@ impl AssetItemContextMenu {
item.path.extension(),
item.path.parent(),
) {
let (old_file_name, extension_name, folder_name, old_path) = (
file_stem.to_string_lossy().to_string(),
extension.to_string_lossy().to_string(),
parent.to_string_lossy().to_string(),
item.path.clone(),
);
let dialog = AssetRenameDialogBuilder::new(
WindowBuilder::new(
WidgetBuilder::new().with_width(350.0).with_height(100.0),
)
.with_title(WindowTitle::text("Rename a Resource"))
.with_title(WindowTitle::text_with_font_size(
"Rename a Resource",
ui.default_font.clone(),
ui.style.property(Editor::UI_FONT_SIZE),
))
.with_remove_on_close(true)
.open(false),
)
.build(
file_stem.to_string_lossy().to_string(),
extension.to_string_lossy().to_string(),
parent.to_string_lossy().to_string(),
item.path.clone(),
old_file_name,
extension_name,
folder_name,
old_path,
engine.resource_manager.clone(),
&mut ui.build_ctx(),
);
Expand Down
Loading
Loading