migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

Rename expand_in_place

Browse Source
This commit is contained in:
Lucas Meurer
2026-08-31 17:03:48 +02:00
parent 059f3879c4
commit 52a6532232
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/egui/src/containers/frame.rs
View File

@@ -298,15 +298,22 @@ impl Frame {
self self
} }
/// Expand the frame without affecting layout. /// Handle `stroke` and `expansion` without affecting layout.
/// ///
/// This handles `expansion` by subtracting it from the outer margin and adding it to the /// This handles `expansion` by subtracting it from the outer margin and adding it to the
/// inner margin. It also corrects for a stroke changing on hover, by subtracting the stroke /// inner margin. It also corrects for `stroke`, by subtracting the stroke width from `inner_margin`.
/// width from `inner_margin`. ///
/// Use this when stroke or expansion might change on hover, and you don't want it to cause
/// layout shifts.
#[inline] #[inline]
pub fn expand_in_place(mut self, expansion: f32) -> Self { pub fn apply_stroke_and_expansion_without_layout_shift(
mut self,
stroke: Stroke,
expansion: f32,
) -> Self {
self.outer_margin = self.outer_margin - Margin::from(expansion); self.outer_margin = self.outer_margin - Margin::from(expansion);
self.inner_margin = self.inner_margin + Margin::from(expansion - self.stroke.width); self.inner_margin = self.inner_margin + Margin::from(expansion - stroke.width);
self.stroke = stroke;
self self
} }

6
crates/egui/src/theme/default_style.rs
View File

@@ -55,13 +55,15 @@ impl StyleProvider<ButtonStyle> for DefaultStyle {
let painted_frame = Frame { let painted_frame = Frame {
fill: widget_visuals.weak_bg_fill, fill: widget_visuals.weak_bg_fill,
stroke: widget_visuals.bg_stroke,
corner_radius: widget_visuals.corner_radius, corner_radius: widget_visuals.corner_radius,
inner_margin, inner_margin,
..Default::default() ..Default::default()
} }
// Ensure changing expansion and stroke don't affect layout: // Ensure changing expansion and stroke don't affect layout:
.expand_in_place(widget_visuals.expansion); .apply_stroke_and_expansion_without_layout_shift(
widget_visuals.bg_stroke,
widget_visuals.expansion,
);
let has_frame = classes.has_class(&Button::CLASS_FRAME) let has_frame = classes.has_class(&Button::CLASS_FRAME)
|| (!classes.has_class(&Button::CLASS_NO_FRAME) && style.visuals.button_frame); || (!classes.has_class(&Button::CLASS_NO_FRAME) && style.visuals.button_frame);