refactor(input): rename internal capture requests

This commit is contained in:
Nova
2024-08-06 12:08:19 -04:00
parent 98a6ad6f32
commit 827c630a70
5 changed files with 12 additions and 10 deletions

View File

@@ -25,7 +25,7 @@ pub struct InputMethod {
handler_aliases: AliasList,
handler_field_aliases: AliasList,
pub(super) handler_order: Mutex<Vec<Weak<InputHandler>>>,
pub capture_requests: Registry<InputHandler>,
pub internal_capture_requests: Registry<InputHandler>,
pub captures: Registry<InputHandler>,
}
impl InputMethod {
@@ -42,7 +42,7 @@ impl InputMethod {
handler_aliases: AliasList::default(),
handler_field_aliases: AliasList::default(),
handler_order: Mutex::new(Vec::new()),
capture_requests: Registry::new(),
internal_capture_requests: Registry::new(),
captures: Registry::new(),
};
<InputMethod as InputMethodRefAspect>::add_node_members(node);
@@ -167,7 +167,9 @@ impl InputMethodRefAspect for InputMethod {
let input_method = node.get_aspect::<InputMethod>()?;
let input_handler = handler.get_aspect::<InputHandler>()?;
input_method.capture_requests.add_raw(&input_handler);
input_method
.internal_capture_requests
.add_raw(&input_handler);
Ok(())
}
}

View File

@@ -145,6 +145,6 @@ pub fn process_input() {
let _ = input_handler_client::input(&handler_node, &methods, &datas);
}
for method in methods {
method.capture_requests.clear();
method.internal_capture_requests.clear();
}
}

View File

@@ -150,7 +150,7 @@ impl MousePointer {
if let Some(capture) = &self.capture {
if !self
.pointer
.capture_requests
.internal_capture_requests
.get_valid_contents()
.contains(capture)
{
@@ -161,7 +161,7 @@ impl MousePointer {
if self.capture.is_none() {
if let Some(new_capture) = self
.pointer
.capture_requests
.internal_capture_requests
.get_valid_contents()
.into_iter()
.map(|h| {

View File

@@ -104,7 +104,7 @@ impl SkController {
if let Some(capture) = &self.capture {
if !self
.input
.capture_requests
.internal_capture_requests
.get_valid_contents()
.contains(capture)
{
@@ -115,7 +115,7 @@ impl SkController {
if self.capture.is_none() {
self.capture = self
.input
.capture_requests
.internal_capture_requests
.get_valid_contents()
.into_iter()
.map(|handler| {

View File

@@ -139,7 +139,7 @@ impl SkHand {
if let Some(capture) = &self.capture {
if !self
.input
.capture_requests
.internal_capture_requests
.get_valid_contents()
.contains(capture)
{
@@ -150,7 +150,7 @@ impl SkHand {
if self.capture.is_none() {
self.capture = self
.input
.capture_requests
.internal_capture_requests
.get_valid_contents()
.into_iter()
.map(|handler| (handler.clone(), self.compare_distance(&handler.field).abs()))