summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/Cargo.toml2
-rw-r--r--core/src/alignment.rs3
-rw-r--r--core/src/font.rs9
-rw-r--r--core/src/mouse/interaction.rs9
-rw-r--r--core/src/padding.rs10
5 files changed, 11 insertions, 22 deletions
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 43865e4d..0d6310d3 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "iced_core"
-version = "0.8.0"
+version = "0.8.1"
authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
edition = "2021"
description = "The essential concepts of Iced"
diff --git a/core/src/alignment.rs b/core/src/alignment.rs
index 73f41d3f..51b7fca9 100644
--- a/core/src/alignment.rs
+++ b/core/src/alignment.rs
@@ -11,9 +11,6 @@ pub enum Alignment {
/// Align at the end of the axis.
End,
-
- /// Fill the entire axis.
- Fill,
}
impl From<Horizontal> for Alignment {
diff --git a/core/src/font.rs b/core/src/font.rs
index 3f9ad2b5..d8c34e5a 100644
--- a/core/src/font.rs
+++ b/core/src/font.rs
@@ -1,10 +1,11 @@
/// A font.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Default)]
pub enum Font {
/// The default font.
///
/// This is normally a font configured in a renderer or loaded from the
/// system.
+ #[default]
Default,
/// An external font.
@@ -16,9 +17,3 @@ pub enum Font {
bytes: &'static [u8],
},
}
-
-impl Default for Font {
- fn default() -> Font {
- Font::Default
- }
-}
diff --git a/core/src/mouse/interaction.rs b/core/src/mouse/interaction.rs
index 664147a7..57da93fe 100644
--- a/core/src/mouse/interaction.rs
+++ b/core/src/mouse/interaction.rs
@@ -1,7 +1,8 @@
/// The interaction of a mouse cursor.
-#[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord)]
+#[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord, Default)]
#[allow(missing_docs)]
pub enum Interaction {
+ #[default]
Idle,
Pointer,
Grab,
@@ -12,9 +13,3 @@ pub enum Interaction {
ResizingHorizontally,
ResizingVertically,
}
-
-impl Default for Interaction {
- fn default() -> Interaction {
- Interaction::Idle
- }
-}
diff --git a/core/src/padding.rs b/core/src/padding.rs
index 752b2b86..0b1bba13 100644
--- a/core/src/padding.rs
+++ b/core/src/padding.rs
@@ -77,12 +77,14 @@ impl Padding {
/// Fits the [`Padding`] between the provided `inner` and `outer` [`Size`].
pub fn fit(self, inner: Size, outer: Size) -> Self {
let available = (outer - inner).max(Size::ZERO);
+ let new_top = self.top.min(available.height);
+ let new_left = self.left.min(available.width);
Padding {
- top: self.top.min(available.height / 2.0),
- right: self.right.min(available.width / 2.0),
- bottom: self.bottom.min(available.height / 2.0),
- left: self.left.min(available.width / 2.0),
+ top: new_top,
+ bottom: self.bottom.min(available.height - new_top),
+ left: new_left,
+ right: self.right.min(available.width - new_left),
}
}
}