summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorLibravatar Olivier Pinon <oliv.pinon@gmail.com>2020-04-12 01:20:40 +0200
committerLibravatar Olivier Pinon <oliv.pinon@gmail.com>2020-04-12 01:20:40 +0200
commit41f6a325e9b6c9df18ab2c3bcf386be988f4b4ef (patch)
tree113ad57d34890978dd93b8a080a24fac8d130301 /native
parentf7d7ab1ba9a037be6bf2a32f7b2662e5314ae3a5 (diff)
downloadiced-41f6a325e9b6c9df18ab2c3bcf386be988f4b4ef.tar.gz
iced-41f6a325e9b6c9df18ab2c3bcf386be988f4b4ef.tar.bz2
iced-41f6a325e9b6c9df18ab2c3bcf386be988f4b4ef.zip
#288 Renamed XXXWidget to Marker
Diffstat (limited to 'native')
-rw-r--r--native/src/widget/button.rs4
-rw-r--r--native/src/widget/checkbox.rs4
-rw-r--r--native/src/widget/column.rs4
-rw-r--r--native/src/widget/container.rs4
-rw-r--r--native/src/widget/image.rs3
-rw-r--r--native/src/widget/pane_grid.rs4
-rw-r--r--native/src/widget/progress_bar.rs4
-rw-r--r--native/src/widget/radio.rs4
-rw-r--r--native/src/widget/row.rs4
-rw-r--r--native/src/widget/scrollable.rs4
-rw-r--r--native/src/widget/slider.rs4
11 files changed, 22 insertions, 21 deletions
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 409ec41d..3cf4f780 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -234,8 +234,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
- struct ButtonWidget;
- std::any::TypeId::of::<ButtonWidget>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.width.hash(state);
self.content.hash_layout(state);
diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index 482e379f..d611993f 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -205,8 +205,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
- struct CheckboxWidget;
- std::any::TypeId::of::<CheckboxWidget>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.label.hash(state);
}
diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs
index ee02244d..259a7e6e 100644
--- a/native/src/widget/column.rs
+++ b/native/src/widget/column.rs
@@ -190,8 +190,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
- struct ColumnWidget;
- std::any::TypeId::of::<ColumnWidget>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.width.hash(state);
self.height.hash(state);
diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs
index 3b661c05..2590fe3b 100644
--- a/native/src/widget/container.rs
+++ b/native/src/widget/container.rs
@@ -203,8 +203,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
- struct ContainerWidget;
- std::any::TypeId::of::<ContainerWidget>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.padding.hash(state);
self.width.hash(state);
diff --git a/native/src/widget/image.rs b/native/src/widget/image.rs
index 0f38a90e..6bd0fd68 100644
--- a/native/src/widget/image.rs
+++ b/native/src/widget/image.rs
@@ -102,7 +102,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
- std::any::TypeId::of::<Image>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.handle.hash(state);
self.width.hash(state);
diff --git a/native/src/widget/pane_grid.rs b/native/src/widget/pane_grid.rs
index 01b008da..f84775ed 100644
--- a/native/src/widget/pane_grid.rs
+++ b/native/src/widget/pane_grid.rs
@@ -597,8 +597,8 @@ where
fn hash_layout(&self, state: &mut Hasher) {
use std::hash::Hash;
- struct PaneGridWidget;
- std::any::TypeId::of::<PaneGridWidget>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.width.hash(state);
self.height.hash(state);
diff --git a/native/src/widget/progress_bar.rs b/native/src/widget/progress_bar.rs
index 0e6e9367..5ab76d47 100644
--- a/native/src/widget/progress_bar.rs
+++ b/native/src/widget/progress_bar.rs
@@ -114,8 +114,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
- struct ProgressBarWidget;
- std::any::TypeId::of::<ProgressBarWidget>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.width.hash(state);
self.height.hash(state);
diff --git a/native/src/widget/radio.rs b/native/src/widget/radio.rs
index c1e36e3d..0ec621bf 100644
--- a/native/src/widget/radio.rs
+++ b/native/src/widget/radio.rs
@@ -174,8 +174,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
- struct RadioWidget;
- std::any::TypeId::of::<RadioWidget>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.label.hash(state);
}
diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs
index 405ba001..31f7472f 100644
--- a/native/src/widget/row.rs
+++ b/native/src/widget/row.rs
@@ -191,8 +191,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
- struct RowWidget;
- std::any::TypeId::of::<RowWidget>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.width.hash(state);
self.height.hash(state);
diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index f1506a3e..393095a4 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -311,8 +311,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
- struct ScrollableWidget;
- std::any::TypeId::of::<ScrollableWidget>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.height.hash(state);
self.max_height.hash(state);
diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs
index 3e8c836e..1feb7825 100644
--- a/native/src/widget/slider.rs
+++ b/native/src/widget/slider.rs
@@ -205,8 +205,8 @@ where
}
fn hash_layout(&self, state: &mut Hasher) {
- struct SliderWidget;
- std::any::TypeId::of::<SliderWidget>().hash(state);
+ struct Marker;
+ std::any::TypeId::of::<Marker>().hash(state);
self.width.hash(state);
}