djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[button] add sense so you can make drag buttons

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-06-10 16:23:15 +02:00
parent 2162ffff42
commit a90dda6162
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
egui/src/widgets.rs
View file

@ -197,6 +197,7 @@ pub struct Button {
text_style: TextStyle, text_style: TextStyle,
/// None means default for interact /// None means default for interact
fill: Option<Color>, fill: Option<Color>,
sense: Sense,
} }
impl Button { impl Button {
@ -206,6 +207,7 @@ impl Button {
text_color: None, text_color: None,
text_style: TextStyle::Button, text_style: TextStyle::Button,
fill: None, fill: None,
sense: Sense::click(),
} }
} }
@ -223,6 +225,13 @@ impl Button {
self.fill = fill; self.fill = fill;
self self
} }
/// By default, buttons senses clicks.
/// Change this to a drag-button with `Sense::drag()`.
pub fn sense(mut self, sense: Sense) -> Self {
self.sense = sense;
self
}
} }
impl Widget for Button { impl Widget for Button {
@ -232,6 +241,7 @@ impl Widget for Button {
text_color, text_color,
text_style, text_style,
fill, fill,
sense,
} = self; } = self;
let id = ui.make_position_id(); let id = ui.make_position_id();
@ -241,7 +251,7 @@ impl Widget for Button {
let mut size = galley.size + 2.0 * padding; let mut size = galley.size + 2.0 * padding;
size.y = size.y.max(ui.style().clickable_diameter); size.y = size.y.max(ui.style().clickable_diameter);
let rect = ui.allocate_space(size); let rect = ui.allocate_space(size);
let interact = ui.interact(rect, id, Sense::click()); let interact = ui.interact(rect, id, sense);
let text_cursor = interact.rect.left_center() + vec2(padding.x, -0.5 * galley.size.y); let text_cursor = interact.rect.left_center() + vec2(padding.x, -0.5 * galley.size.y);
let bg_fill = fill.or(ui.style().interact(&interact).bg_fill); let bg_fill = fill.or(ui.style().interact(&interact).bg_fill);
ui.add_paint_cmd(PaintCmd::Rect { ui.add_paint_cmd(PaintCmd::Rect {