⚠️ Rename Rounding to CornerRadius (#5673)

Breaking change!

* `Rounding` -> `CornerRadius`
* `rounding` -> `corner_radius`

This is to:
* Clarify
* Conform to other systems (e.g. Figma)
* Avoid confusion with `GuiRounding`

Author: emilk

crates/egui/src/containers/collapsing_header.rs

@@ -573,7 +573,7 @@ impl CollapsingHeader {
             if ui.visuals().collapsing_header_frame || show_background {
                 ui.painter().add(epaint::RectShape::new(
                     header_response.rect.expand(visuals.expansion),
-                    visuals.rounding,
+                    visuals.corner_radius,
                     visuals.weak_bg_fill,
                     visuals.bg_stroke,
                     StrokeKind::Inside,
@@ -586,7 +586,7 @@ impl CollapsingHeader {
 
                 ui.painter().rect(
                     rect,
-                    visuals.rounding,
+                    visuals.corner_radius,
                     visuals.bg_fill,
                     visuals.bg_stroke,
                     StrokeKind::Inside,

crates/egui/src/containers/combo_box.rs

@@ -471,7 +471,7 @@ fn button_frame(
             where_to_put_background,
             epaint::RectShape::new(
                 outer_rect.expand(visuals.expansion),
-                visuals.rounding,
+                visuals.corner_radius,
                 visuals.weak_bg_fill,
                 visuals.bg_stroke,
                 epaint::StrokeKind::Inside,

crates/egui/src/containers/frame.rs

@@ -4,7 +4,7 @@ use crate::{
     epaint, layers::ShapeIdx, InnerResponse, Response, Sense, Style, Ui, UiBuilder, UiKind,
     UiStackInfo,
 };
-use epaint::{Color32, Margin, Marginf, Rect, Rounding, Shadow, Shape, Stroke};
+use epaint::{Color32, CornerRadius, Margin, Marginf, Rect, Shadow, Shape, Stroke};
 
 /// A frame around some content, including margin, colors, etc.
 ///
@@ -119,7 +119,7 @@ pub struct Frame {
     /// (or, if there is no stroke, the outer corner of [`Self::fill`]).
     ///
     /// In other words, this is the corner radius of the _widget rect_.
-    pub rounding: Rounding,
+    pub corner_radius: CornerRadius,
 
     /// Margin outside the painted frame.
     ///
@@ -161,7 +161,7 @@ impl Frame {
         inner_margin: Margin::ZERO,
         stroke: Stroke::NONE,
         fill: Color32::TRANSPARENT,
-        rounding: Rounding::ZERO,
+        corner_radius: CornerRadius::ZERO,
         outer_margin: Margin::ZERO,
         shadow: Shadow::NONE,
     };
@@ -182,7 +182,7 @@ impl Frame {
     pub fn group(style: &Style) -> Self {
         Self::new()
             .inner_margin(6)
-            .rounding(style.visuals.widgets.noninteractive.rounding)
+            .corner_radius(style.visuals.widgets.noninteractive.corner_radius)
             .stroke(style.visuals.widgets.noninteractive.bg_stroke)
     }
 
@@ -199,7 +199,7 @@ impl Frame {
     pub fn window(style: &Style) -> Self {
         Self::new()
             .inner_margin(style.spacing.window_margin)
-            .rounding(style.visuals.window_rounding)
+            .corner_radius(style.visuals.window_corner_radius)
             .shadow(style.visuals.window_shadow)
             .fill(style.visuals.window_fill())
             .stroke(style.visuals.window_stroke())
@@ -208,7 +208,7 @@ impl Frame {
     pub fn menu(style: &Style) -> Self {
         Self::new()
             .inner_margin(style.spacing.menu_margin)
-            .rounding(style.visuals.menu_rounding)
+            .corner_radius(style.visuals.menu_corner_radius)
             .shadow(style.visuals.popup_shadow)
             .fill(style.visuals.window_fill())
             .stroke(style.visuals.window_stroke())
@@ -217,7 +217,7 @@ impl Frame {
     pub fn popup(style: &Style) -> Self {
         Self::new()
             .inner_margin(style.spacing.menu_margin)
-            .rounding(style.visuals.menu_rounding)
+            .corner_radius(style.visuals.menu_corner_radius)
             .shadow(style.visuals.popup_shadow)
             .fill(style.visuals.window_fill())
             .stroke(style.visuals.window_stroke())
@@ -230,7 +230,7 @@ impl Frame {
     pub fn canvas(style: &Style) -> Self {
         Self::new()
             .inner_margin(2)
-            .rounding(style.visuals.widgets.noninteractive.rounding)
+            .corner_radius(style.visuals.widgets.noninteractive.corner_radius)
             .fill(style.visuals.extreme_bg_color)
             .stroke(style.visuals.window_stroke())
     }
@@ -277,11 +277,21 @@ impl Frame {
     ///
     /// In other words, this is the corner radius of the _widget rect_.
     #[inline]
-    pub fn rounding(mut self, rounding: impl Into<Rounding>) -> Self {
-        self.rounding = rounding.into();
+    pub fn corner_radius(mut self, corner_radius: impl Into<CornerRadius>) -> Self {
+        self.corner_radius = corner_radius.into();
         self
     }
 
+    /// The rounding of the _outer_ corner of the [`Self::stroke`]
+    /// (or, if there is no stroke, the outer corner of [`Self::fill`]).
+    ///
+    /// In other words, this is the corner radius of the _widget rect_.
+    #[inline]
+    #[deprecated = "Renamed to `corner_radius`"]
+    pub fn rounding(self, corner_radius: impl Into<CornerRadius>) -> Self {
+        self.corner_radius(corner_radius)
+    }
+
     /// Margin outside the painted frame.
     ///
     /// Similar to what is called `margin` in CSS.
@@ -424,7 +434,7 @@ impl Frame {
             inner_margin: _,
             fill,
             stroke,
-            rounding,
+            corner_radius,
             outer_margin: _,
             shadow,
         } = *self;
@@ -433,7 +443,7 @@ impl Frame {
 
         let frame_shape = Shape::Rect(epaint::RectShape::new(
             widget_rect,
-            rounding,
+            corner_radius,
             fill,
             stroke,
             epaint::StrokeKind::Inside,
@@ -442,7 +452,7 @@ impl Frame {
         if shadow == Default::default() {
             frame_shape
         } else {
-            let shadow = shadow.as_shape(widget_rect, rounding);
+            let shadow = shadow.as_shape(widget_rect, corner_radius);
             Shape::Vec(vec![Shape::from(shadow), frame_shape])
         }
     }

crates/egui/src/containers/scroll_area.rs

@@ -1240,7 +1240,7 @@ impl Prepared {
                 // Background:
                 ui.painter().add(epaint::Shape::rect_filled(
                     outer_scroll_bar_rect,
-                    visuals.rounding,
+                    visuals.corner_radius,
                     ui.visuals()
                         .extreme_bg_color
                         .gamma_multiply(background_opacity),
@@ -1249,7 +1249,7 @@ impl Prepared {
                 // Handle:
                 ui.painter().add(epaint::Shape::rect_filled(
                     handle_rect,
-                    visuals.rounding,
+                    visuals.corner_radius,
                     handle_color.gamma_multiply(handle_opacity),
                 ));
             }

crates/egui/src/containers/window.rs

@@ -3,7 +3,7 @@
 use std::sync::Arc;
 
 use emath::GuiRounding as _;
-use epaint::{RectShape, Roundingf};
+use epaint::{CornerRadiusF32, RectShape};
 
 use crate::collapsing_header::CollapsingState;
 use crate::*;
@@ -485,8 +485,8 @@ impl Window<'_> {
                 .at_least(style.spacing.interact_size.y);
             let title_bar_inner_height = title_bar_inner_height + window_frame.inner_margin.sum().y;
             let half_height = (title_bar_inner_height / 2.0).round() as _;
-            window_frame.rounding.ne = window_frame.rounding.ne.clamp(0, half_height);
-            window_frame.rounding.nw = window_frame.rounding.nw.clamp(0, half_height);
+            window_frame.corner_radius.ne = window_frame.corner_radius.ne.clamp(0, half_height);
+            window_frame.corner_radius.nw = window_frame.corner_radius.nw.clamp(0, half_height);
 
             let title_content_spacing = if is_collapsed {
                 0.0
@@ -612,7 +612,7 @@ impl Window<'_> {
 
                     if on_top && area_content_ui.visuals().window_highlight_topmost {
                         let mut round =
-                            window_frame.rounding - window_frame.stroke.width.round() as u8;
+                            window_frame.corner_radius - window_frame.stroke.width.round() as u8;
 
                         if !is_collapsed {
                             round.se = 0;
@@ -667,28 +667,28 @@ fn paint_resize_corner(
     window_frame: &Frame,
     i: ResizeInteraction,
 ) {
-    let rounding = window_frame.rounding;
+    let cr = window_frame.corner_radius;
 
     let (corner, radius, corner_response) = if possible.resize_right && possible.resize_bottom {
-        (Align2::RIGHT_BOTTOM, rounding.se, i.right & i.bottom)
+        (Align2::RIGHT_BOTTOM, cr.se, i.right & i.bottom)
     } else if possible.resize_left && possible.resize_bottom {
-        (Align2::LEFT_BOTTOM, rounding.sw, i.left & i.bottom)
+        (Align2::LEFT_BOTTOM, cr.sw, i.left & i.bottom)
     } else if possible.resize_left && possible.resize_top {
-        (Align2::LEFT_TOP, rounding.nw, i.left & i.top)
+        (Align2::LEFT_TOP, cr.nw, i.left & i.top)
     } else if possible.resize_right && possible.resize_top {
-        (Align2::RIGHT_TOP, rounding.ne, i.right & i.top)
+        (Align2::RIGHT_TOP, cr.ne, i.right & i.top)
     } else {
         // We're not in two directions, but it is still nice to tell the user
         // we're resizable by painting the resize corner in the expected place
         // (i.e. for windows only resizable in one direction):
         if possible.resize_right || possible.resize_bottom {
-            (Align2::RIGHT_BOTTOM, rounding.se, i.right & i.bottom)
+            (Align2::RIGHT_BOTTOM, cr.se, i.right & i.bottom)
         } else if possible.resize_left || possible.resize_bottom {
-            (Align2::LEFT_BOTTOM, rounding.sw, i.left & i.bottom)
+            (Align2::LEFT_BOTTOM, cr.sw, i.left & i.bottom)
         } else if possible.resize_left || possible.resize_top {
-            (Align2::LEFT_TOP, rounding.nw, i.left & i.top)
+            (Align2::LEFT_TOP, cr.nw, i.left & i.top)
         } else if possible.resize_right || possible.resize_top {
-            (Align2::RIGHT_TOP, rounding.ne, i.right & i.top)
+            (Align2::RIGHT_TOP, cr.ne, i.right & i.top)
         } else {
             return;
         }
@@ -1054,7 +1054,7 @@ fn paint_frame_interaction(ui: &Ui, rect: Rect, interaction: ResizeInteraction)
         bottom = interaction.bottom.hover;
     }
 
-    let rounding = Roundingf::from(ui.visuals().window_rounding);
+    let cr = CornerRadiusF32::from(ui.visuals().window_corner_radius);
 
     // Put the rect in the center of the fixed window stroke:
     let rect = rect.shrink(interaction.window_frame.stroke.width / 2.0);
@@ -1072,56 +1072,36 @@ fn paint_frame_interaction(ui: &Ui, rect: Rect, interaction: ResizeInteraction)
     let mut points = Vec::new();
 
     if right && !bottom && !top {
-        points.push(pos2(max.x, min.y + rounding.ne));
-        points.push(pos2(max.x, max.y - rounding.se));
+        points.push(pos2(max.x, min.y + cr.ne));
+        points.push(pos2(max.x, max.y - cr.se));
     }
     if right && bottom {
-        points.push(pos2(max.x, min.y + rounding.ne));
-        points.push(pos2(max.x, max.y - rounding.se));
-        add_circle_quadrant(
-            &mut points,
-            pos2(max.x - rounding.se, max.y - rounding.se),
-            rounding.se,
-            0.0,
-        );
+        points.push(pos2(max.x, min.y + cr.ne));
+        points.push(pos2(max.x, max.y - cr.se));
+        add_circle_quadrant(&mut points, pos2(max.x - cr.se, max.y - cr.se), cr.se, 0.0);
     }
     if bottom {
-        points.push(pos2(max.x - rounding.se, max.y));
-        points.push(pos2(min.x + rounding.sw, max.y));
+        points.push(pos2(max.x - cr.se, max.y));
+        points.push(pos2(min.x + cr.sw, max.y));
     }
     if left && bottom {
-        add_circle_quadrant(
-            &mut points,
-            pos2(min.x + rounding.sw, max.y - rounding.sw),
-            rounding.sw,
-            1.0,
-        );
+        add_circle_quadrant(&mut points, pos2(min.x + cr.sw, max.y - cr.sw), cr.sw, 1.0);
     }
     if left {
-        points.push(pos2(min.x, max.y - rounding.sw));
-        points.push(pos2(min.x, min.y + rounding.nw));
+        points.push(pos2(min.x, max.y - cr.sw));
+        points.push(pos2(min.x, min.y + cr.nw));
     }
     if left && top {
-        add_circle_quadrant(
-            &mut points,
-            pos2(min.x + rounding.nw, min.y + rounding.nw),
-            rounding.nw,
-            2.0,
-        );
+        add_circle_quadrant(&mut points, pos2(min.x + cr.nw, min.y + cr.nw), cr.nw, 2.0);
     }
     if top {
-        points.push(pos2(min.x + rounding.nw, min.y));
-        points.push(pos2(max.x - rounding.ne, min.y));
+        points.push(pos2(min.x + cr.nw, min.y));
+        points.push(pos2(max.x - cr.ne, min.y));
     }
     if right && top {
-        add_circle_quadrant(
-            &mut points,
-            pos2(max.x - rounding.ne, min.y + rounding.ne),
-            rounding.ne,
-            3.0,
-        );
-        points.push(pos2(max.x, min.y + rounding.ne));
-        points.push(pos2(max.x, max.y - rounding.se));
+        add_circle_quadrant(&mut points, pos2(max.x - cr.ne, min.y + cr.ne), cr.ne, 3.0);
+        points.push(pos2(max.x, min.y + cr.ne));
+        points.push(pos2(max.x, max.y - cr.se));
     }
 
     ui.painter().add(Shape::line(points, stroke));

crates/egui/src/lib.rs

@@ -464,8 +464,8 @@ pub use epaint::{
     mutex,
     text::{FontData, FontDefinitions, FontFamily, FontId, FontTweak},
     textures::{TextureFilter, TextureOptions, TextureWrapMode, TexturesDelta},
-    ClippedPrimitive, ColorImage, FontImage, ImageData, Margin, Mesh, PaintCallback,
-    PaintCallbackInfo, Rounding, Shadow, Shape, Stroke, StrokeKind, TextureHandle, TextureId,
+    ClippedPrimitive, ColorImage, CornerRadius, FontImage, ImageData, Margin, Mesh, PaintCallback,
+    PaintCallbackInfo, Shadow, Shape, Stroke, StrokeKind, TextureHandle, TextureId,
 };
 
 pub mod text {
@@ -510,6 +510,9 @@ pub use self::{
     widgets::*,
 };
 
+#[deprecated = "Renamed to CornerRadius"]
+pub type Rounding = CornerRadius;
+
 // ----------------------------------------------------------------------------
 
 /// Helper function that adds a label when compiling with debug assertions enabled.
@@ -538,7 +541,7 @@ pub fn warn_if_debug_build(ui: &mut crate::Ui) {
 /// ui.add(
 ///     egui::Image::new(egui::include_image!("../assets/ferris.png"))
 ///         .max_width(200.0)
-///         .rounding(10.0),
+///         .corner_radius(10),
 /// );
 ///
 /// let image_source: egui::ImageSource = egui::include_image!("../assets/ferris.png");

crates/egui/src/menu.rs

@@ -580,7 +580,7 @@ impl SubMenuButton {
             if ui.visuals().button_frame {
                 ui.painter().rect_filled(
                     rect.expand(visuals.expansion),
-                    visuals.rounding,
+                    visuals.corner_radius,
                     visuals.weak_bg_fill,
                 );
             }