oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use InteractiveBounds everywhere we change the cursor style

Browse Source
This commit is contained in:
Antonio Scandurra
2023-12-20 13:59:52 +01:00
parent 2f57a3ccfb
commit 5781cf6604
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/editor2/src/element.rs
+11 -3
View File
@@ -884,7 +884,11 @@ impl EditorElement {
bounds: text_bounds,
}),
|cx| {
if text_bounds.contains(&cx.mouse_position()) {
let interactive_text_bounds = InteractiveBounds {
bounds: text_bounds,
stacking_order: cx.stacking_order().clone(),
};
if interactive_text_bounds.visibly_contains(&cx.mouse_position(), cx) {
if self
.editor
.read(cx)
@@ -1361,8 +1365,12 @@ impl EditorElement {
));
}
let interactive_track_bounds = InteractiveBounds {
bounds: track_bounds,
stacking_order: cx.stacking_order().clone(),
};
let mut mouse_position = cx.mouse_position();
if track_bounds.contains(&mouse_position) {
if interactive_track_bounds.visibly_contains(&mouse_position, cx) {
cx.set_cursor_style(CursorStyle::Arrow);
}
@@ -1392,7 +1400,7 @@ impl EditorElement {
cx.stop_propagation();
} else {
editor.scroll_manager.set_is_dragging_scrollbar(false, cx);
if track_bounds.contains(&event.position) {
if interactive_track_bounds.visibly_contains(&event.position, cx) {
editor.scroll_manager.show_scrollbar(cx);
}
}