Skip to content

Commit 272806d

Browse files
ids1024jackpot51
authored andcommitted
improv: Remove use of gtk::AspectFrame
1 parent c4ebf9a commit 272806d

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

src/color_circle.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ pub enum ColorCircleSymbol {
2626
}
2727

2828
pub struct ColorCircleInner {
29-
frame: gtk::AspectFrame,
3029
drawing_area: gtk::DrawingArea,
3130
button: gtk::Button,
3231
rgb: Cell<Rgb>,
@@ -60,14 +59,7 @@ impl ObjectSubclass for ColorCircleInner {
6059
..add(&drawing_area);
6160
};
6261

63-
let frame = cascade! {
64-
gtk::AspectFrame::new(None, 0., 0., 1., false);
65-
..set_shadow_type(gtk::ShadowType::None);
66-
..add(&button);
67-
};
68-
6962
Self {
70-
frame,
7163
drawing_area,
7264
button,
7365
rgb: Cell::new(Rgb::new(0, 0, 0)),
@@ -84,7 +76,7 @@ impl ObjectImpl for ColorCircleInner {
8476
self.parent_constructed(obj);
8577

8678
let obj: &ColorCircle = obj.downcast_ref().unwrap();
87-
obj.add(&self.frame);
79+
obj.add(&self.button);
8880
}
8981
}
9082

@@ -110,7 +102,7 @@ impl ColorCircle {
110102
.downcast()
111103
.unwrap();
112104

113-
color_circle.inner().frame.set_size_request(size, size);
105+
color_circle.set_size_request(size, size);
114106
color_circle.connect_signals();
115107

116108
color_circle

0 commit comments

Comments
 (0)