Merge branch 'master' into beacon

2025-03-11 22:25:06 +01:00 · 2025-03-11 22:25:06 +01:00 · ebfcb65841
commit ebfcb65841
parent a106f7f837 fd5ed0d0a6
41 changed files with 805 additions and 589 deletions
--- a/winit/src/program/window_manager.rs
+++ b/winit/src/program/window_manager.rs
@ -338,8 +338,8 @@ where
                    .unwrap_or_else(|| renderer.default_size()),
                line_height: text::LineHeight::default(),
                font: renderer.default_font(),
-                horizontal_alignment: alignment::Horizontal::Left,
-                vertical_alignment: alignment::Vertical::Top,
+                align_x: text::Alignment::Default,
+                align_y: alignment::Vertical::Top,
                shaping: text::Shaping::Advanced,
                wrapping: text::Wrapping::None,
            });