summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-06-01 22:07:29 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-06-01 22:07:29 +0200
commitb96d87ff6917e7dc75178e4c623d20d577ef583f (patch)
tree87da05d984bbac2458c41caf0cea8c5b2cc26c46 /src
parent2ba9598f8022bf3035d97f1a30e53117b9619235 (diff)
downloadiced-b96d87ff6917e7dc75178e4c623d20d577ef583f.tar.gz
iced-b96d87ff6917e7dc75178e4c623d20d577ef583f.tar.bz2
iced-b96d87ff6917e7dc75178e4c623d20d577ef583f.zip
Revert "Merge pull request #371 from myfreeweb/window-alpha"
This reverts commit 2ba9598f8022bf3035d97f1a30e53117b9619235, reversing changes made to d34f8e06c8e3cdbba07a272f346163cfc0f920a6.
Diffstat (limited to 'src')
-rw-r--r--src/application.rs1
-rw-r--r--src/settings.rs28
2 files changed, 2 insertions, 27 deletions
diff --git a/src/application.rs b/src/application.rs
index a529580e..19cab7da 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -195,7 +195,6 @@ pub trait Application: Sized {
} else {
None
},
- background_color: settings.background_color,
..crate::renderer::Settings::default()
};
diff --git a/src/settings.rs b/src/settings.rs
index 1aa17571..01ad0ee0 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -1,8 +1,8 @@
//! Configure your application.
-use crate::{window, Color};
+use crate::window;
/// The settings of an application.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
pub struct Settings<Flags> {
/// The window settings.
///
@@ -32,29 +32,6 @@ pub struct Settings<Flags> {
///
/// [`Canvas`]: ../widget/canvas/struct.Canvas.html
pub antialiasing: bool,
-
- /// The background color of the window.
- ///
- /// On supported backends, this makes it possible to have
- /// (semi-)transparent windows.
- ///
- /// By default, it is white.
- pub background_color: Color,
-}
-
-impl<Flags> Default for Settings<Flags>
-where
- Flags: Default,
-{
- fn default() -> Self {
- Self {
- flags: Default::default(),
- antialiasing: Default::default(),
- default_font: Default::default(),
- window: Default::default(),
- background_color: Color::WHITE,
- }
- }
}
impl<Flags> Settings<Flags> {
@@ -69,7 +46,6 @@ impl<Flags> Settings<Flags> {
antialiasing: Default::default(),
default_font: Default::default(),
window: Default::default(),
- background_color: Color::WHITE,
}
}
}