Skip to content

Commit 1b566d1

Browse files
committed
renamed InputProvider::mouse_button_currently_pressed methods to mouse_button_down
1 parent 1374455 commit 1b566d1

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

src/events/global_input.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl <'a> InputProvider<'a, GlobalInputEventIterator<'a>> for GlobalInput {
3434
&self.current_state
3535
}
3636

37-
fn mouse_button_currently_pressed(&self, button: MouseButton) -> Option<Point> {
37+
fn mouse_button_down(&self, button: MouseButton) -> Option<Point> {
3838
self.current_state().mouse_buttons.get(button).map(|_| {
3939
self.mouse_position()
4040
})

src/events/input_provider.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub trait InputProvider<'a, T: Iterator<Item=&'a UiEvent>> {
2121

2222
/// If the given mouse button is currently pressed, returns the current position of the mouse.
2323
/// Otherwise, returns `None`
24-
fn mouse_button_currently_pressed(&'a self, button: MouseButton) -> Option<Point>;
24+
fn mouse_button_down(&'a self, button: MouseButton) -> Option<Point>;
2525

2626
//////////////////////////////////////////////////
2727
// Methods that just check the stream of events //
@@ -156,14 +156,14 @@ pub trait InputProvider<'a, T: Iterator<Item=&'a UiEvent>> {
156156

157157
/// Convenience method for checking if the Left mouse button is down.
158158
/// Returns mouse position if the Left mouse button is currently pressed, otherwise `None`.
159-
fn mouse_left_button_currently_pressed(&'a self) -> Option<Point> {
160-
self.mouse_button_currently_pressed(MouseButton::Left)
159+
fn mouse_left_button_down(&'a self) -> Option<Point> {
160+
self.mouse_button_down(MouseButton::Left)
161161
}
162162

163163
/// Convenience method for checking if the Right mouse button is down.
164164
/// Returns mouse position if the Right mouse button is currently pressed, otherwise `None`.
165-
fn mouse_right_button_currently_pressed(&'a self) -> Option<Point> {
166-
self.mouse_button_currently_pressed(MouseButton::Right)
165+
fn mouse_right_button_down(&'a self) -> Option<Point> {
166+
self.mouse_button_down(MouseButton::Right)
167167
}
168168

169169
/// Convenience method for returning the current mouse position.

src/events/widget_input.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ impl<'a> InputProvider<'a, WidgetInputEventIterator<'a>> for WidgetInput<'a> {
128128
}).last()
129129
}
130130

131-
fn mouse_button_currently_pressed(&self, button: MouseButton) -> Option<Point> {
131+
fn mouse_button_down(&self, button: MouseButton) -> Option<Point> {
132132
self.current_state().mouse_buttons.get(button).iter().filter(|_| {
133133
self.current_state().widget_capturing_mouse.map(|capturing| {
134134
capturing == self.widget_idx

src/tests/global_input.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,24 @@ fn global_input_should_track_current_mouse_position() {
8181
}
8282

8383
#[test]
84-
fn mouse_button_currently_pressed_should_return_current_mouse_position_if_button_is_pressed() {
84+
fn mouse_button_down_should_return_current_mouse_position_if_button_is_pressed() {
8585
let mut input = GlobalInput::new(0.0);
8686

8787
input.push_event(mouse_move_event(50.0, 77.7));
8888
input.push_event(UiEvent::Raw(Input::Press(Mouse(MouseButton::Left))));
8989

90-
assert_eq!(Some([50.0, 77.7]), input.mouse_button_currently_pressed(MouseButton::Left));
90+
assert_eq!(Some([50.0, 77.7]), input.mouse_button_down(MouseButton::Left));
9191
}
9292

9393
#[test]
94-
fn mouse_button_currently_pressed_should_return_none_if_button_is_not_pressed() {
94+
fn mouse_button_down_should_return_none_if_button_is_not_pressed() {
9595
let pressed_button = MouseButton::Middle;
9696
let non_pressed_button = MouseButton::Right;
9797

9898
let mut input = GlobalInput::new(0.0);
9999
input.push_event(UiEvent::Raw(Input::Press(Mouse(pressed_button))));
100100

101-
assert!(input.mouse_button_currently_pressed(non_pressed_button).is_none());
101+
assert!(input.mouse_button_down(non_pressed_button).is_none());
102102
}
103103

104104
#[test]

src/tests/input_provider.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ fn mouse_position_should_return_mouse_position_from_current_state() {
1414
}
1515

1616
#[test]
17-
fn mouse_button_currently_pressed_should_return_true_if_button_is_pressed() {
17+
fn mouse_button_down_should_return_true_if_button_is_pressed() {
1818
let mut input_state = InputState::new();
1919
input_state.mouse_buttons.set(MouseButton::Right, Some([0.0, 0.0]));
2020
let input = ProviderImpl::with_input_state(input_state);
21-
assert_eq!(Some([0.0, 0.0]), input.mouse_button_currently_pressed(MouseButton::Right));
22-
assert!(input.mouse_left_button_currently_pressed().is_none());
21+
assert_eq!(Some([0.0, 0.0]), input.mouse_button_down(MouseButton::Right));
22+
assert!(input.mouse_left_button_down().is_none());
2323
}
2424

2525
#[test]
@@ -194,7 +194,7 @@ impl<'a> InputProvider<'a, TestInputEventIterator<'a>> for ProviderImpl {
194194
&self.current_state
195195
}
196196

197-
fn mouse_button_currently_pressed(&self, button: MouseButton) -> Option<Point> {
197+
fn mouse_button_down(&self, button: MouseButton) -> Option<Point> {
198198
self.current_state().mouse_buttons.get(button).map(|_| {
199199
self.mouse_position()
200200
})

src/tests/widget_input.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ use widget::{Index, Id};
66
use position::Rect;
77

88
#[test]
9-
fn mouse_button_currently_pressed_should_return_none_if_mouse_is_not_over_widget() {
9+
fn mouse_button_down_should_return_none_if_mouse_is_not_over_widget() {
1010
let widget_area = Rect::from_corners([10.0, 10.0], [50.0, 50.0]);
1111
let mut global_input = GlobalInput::new(4.0);
1212
// mouse position stays at (0,0)
1313
global_input.push_event(UiEvent::Raw(Input::Press(Button::Mouse(MouseButton::Left))));
1414

1515
let widget_input = WidgetInput::for_widget(Index::Public(Id(2)), widget_area, &global_input);
1616

17-
assert!(widget_input.mouse_left_button_currently_pressed().is_none());
17+
assert!(widget_input.mouse_left_button_down().is_none());
1818
}
1919

2020
#[test]
21-
fn mouse_button_currently_pressed_should_return_none_if_another_widget_is_capturing_mouse() {
21+
fn mouse_button_down_should_return_none_if_another_widget_is_capturing_mouse() {
2222
let widget_area = Rect::from_corners([10.0, 10.0], [50.0, 50.0]);
2323
let mut global_input = GlobalInput::new(4.0);
2424
global_input.push_event(UiEvent::WidgetCapturesMouse(Index::Public(Id(999))));
@@ -27,19 +27,19 @@ fn mouse_button_currently_pressed_should_return_none_if_another_widget_is_captur
2727

2828
let widget_input = WidgetInput::for_widget(Index::Public(Id(2)), widget_area, &global_input);
2929

30-
assert!(widget_input.mouse_left_button_currently_pressed().is_none());
30+
assert!(widget_input.mouse_left_button_down().is_none());
3131
}
3232

3333
#[test]
34-
fn mouse_button_currently_pressed_should_return_current_mouse_position_if_mouse_is_over_widget() {
34+
fn mouse_button_down_should_return_current_mouse_position_if_mouse_is_over_widget() {
3535
let widget_area = Rect::from_corners([10.0, 10.0], [50.0, 50.0]);
3636
let mut global_input = GlobalInput::new(4.0);
3737
global_input.push_event(UiEvent::Raw(Input::Move(Motion::MouseRelative(30.0, 30.0))));
3838
global_input.push_event(UiEvent::Raw(Input::Press(Button::Mouse(MouseButton::Left))));
3939

4040
let widget_input = WidgetInput::for_widget(Index::Public(Id(2)), widget_area, &global_input);
4141

42-
assert_eq!(Some([0.0, 0.0]), widget_input.mouse_left_button_currently_pressed());
42+
assert_eq!(Some([0.0, 0.0]), widget_input.mouse_left_button_down());
4343
}
4444

4545
#[test]

src/widget/button.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use {
1414
Widget,
1515
};
1616
use widget;
17-
use events::{WidgetInput, InputProvider};
17+
use events::InputProvider;
1818

1919

2020
/// A pressable button widget whose reaction is triggered upon release.
@@ -116,7 +116,7 @@ impl<'a, F> Widget for Button<'a, F>
116116
}
117117

118118
let style_color = style.color(ui.theme());
119-
input.mouse_left_button_currently_pressed().map(|_| {
119+
input.mouse_left_button_down().map(|_| {
120120
style_color.clicked()
121121
}).or_else(|| {
122122
input.maybe_mouse_position().map(|_| style_color.highlighted())

0 commit comments

Comments
 (0)