language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-09-28 21:04:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Minor GenericWindow trait cleanup

Browse source 
The trait functions don't need to consume an Rc, it turns out.
This commit is contained in:
Simon Hausmann 2020-06-16 14:42:13 +02:00
parent c940e8d734
commit cb0aeb0db7
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sixtyfps_runtime/corelib/lib.rs
View file

@ -55,9 +55,9 @@ use std::cell::RefCell;
use std::rc::{Rc, Weak}; use std::rc::{Rc, Weak};
trait GenericWindow { trait GenericWindow {
fn draw(self: Rc<Self>, component: vtable::VRef<crate::abi::datastructures::ComponentVTable>); fn draw(&self, component: vtable::VRef<crate::abi::datastructures::ComponentVTable>);
fn process_mouse_input( fn process_mouse_input(
self: Rc<Self>, &self,
pos: winit::dpi::PhysicalPosition<f64>, pos: winit::dpi::PhysicalPosition<f64>,
state: winit::event::ElementState, state: winit::event::ElementState,
component: vtable::VRef<crate::abi::datastructures::ComponentVTable>, component: vtable::VRef<crate::abi::datastructures::ComponentVTable>,
@ -114,7 +114,7 @@ impl<GraphicsBackend: graphics::GraphicsBackend> Drop for MainWindow<GraphicsBac
impl<GraphicsBackend: graphics::GraphicsBackend> GenericWindow impl<GraphicsBackend: graphics::GraphicsBackend> GenericWindow
for RefCell<MainWindow<GraphicsBackend>> for RefCell<MainWindow<GraphicsBackend>>
{ {
fn draw(self: Rc<Self>, component: vtable::VRef<abi::datastructures::ComponentVTable>) { fn draw(&self, component: vtable::VRef<abi::datastructures::ComponentVTable>) {
// FIXME: we should do that only if some property change // FIXME: we should do that only if some property change
component.compute_layout(); component.compute_layout();
@ -156,7 +156,7 @@ impl<GraphicsBackend: graphics::GraphicsBackend> GenericWindow
this.graphics_backend.present_frame(frame); this.graphics_backend.present_frame(frame);
} }
fn process_mouse_input( fn process_mouse_input(
self: Rc<Self>, &self,
pos: winit::dpi::PhysicalPosition<f64>, pos: winit::dpi::PhysicalPosition<f64>,
state: winit::event::ElementState, state: winit::event::ElementState,
component: vtable::VRef<abi::datastructures::ComponentVTable>, component: vtable::VRef<abi::datastructures::ComponentVTable>,
@ -206,7 +206,7 @@ fn run_event_loop(
if let Some(Some(window)) = if let Some(Some(window)) =
windows.borrow().get(&id).map(|weakref| weakref.upgrade()) windows.borrow().get(&id).map(|weakref| weakref.upgrade())
{ {
window.clone().draw(component); window.draw(component);
} }
}); });
} }
@ -227,7 +227,7 @@ fn run_event_loop(
if let Some(Some(window)) = if let Some(Some(window)) =
windows.borrow().get(&window_id).map(|weakref| weakref.upgrade()) windows.borrow().get(&window_id).map(|weakref| weakref.upgrade())
{ {
window.clone().process_mouse_input(cursor_pos, state, component); window.process_mouse_input(cursor_pos, state, component);
let window = window.window_handle(); let window = window.window_handle();
// FIXME: remove this, it should be based on actual changes rather than this // FIXME: remove this, it should be based on actual changes rather than this
window.request_redraw(); window.request_redraw();