Updated examples with a few small changes to resolve warnings
This commit is contained in:
@@ -2,6 +2,16 @@ use std::sync::Arc;
|
||||
|
||||
use osui::prelude::*;
|
||||
|
||||
fn main() -> std::io::Result<()> {
|
||||
let screen = Screen::new();
|
||||
screen.extension(InputExtension);
|
||||
screen.extension(RelativeFocusExtension::new());
|
||||
|
||||
app(screen.clone()).draw(&screen);
|
||||
|
||||
screen.run()
|
||||
}
|
||||
|
||||
pub fn app(screen: Arc<Screen>) -> Rsx {
|
||||
let count = use_state(0);
|
||||
|
||||
@@ -96,7 +96,7 @@ impl Context {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_widgets(&self) -> MutexGuard<Vec<Arc<Widget>>> {
|
||||
pub fn get_widgets(&'_ self) -> MutexGuard<'_, Vec<Arc<Widget>>> {
|
||||
self.screen.widgets.lock().unwrap()
|
||||
}
|
||||
|
||||
|
||||
-12
@@ -1,12 +0,0 @@
|
||||
mod demos;
|
||||
use osui::prelude::*;
|
||||
|
||||
fn main() -> std::io::Result<()> {
|
||||
let screen = Screen::new();
|
||||
screen.extension(InputExtension);
|
||||
screen.extension(RelativeFocusExtension::new());
|
||||
|
||||
demos::app(screen.clone()).draw(&screen);
|
||||
|
||||
screen.run()
|
||||
}
|
||||
+3
-3
@@ -166,7 +166,7 @@ impl Widget {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_elem(&self) -> MutexGuard<BoxedElement> {
|
||||
pub fn get_elem(&'_ self) -> MutexGuard<'_, BoxedElement> {
|
||||
match self {
|
||||
Widget::Static(w) => w.get_elem(),
|
||||
Widget::Dynamic(w) => w.get_elem(),
|
||||
@@ -284,7 +284,7 @@ impl Widget {
|
||||
|
||||
impl StaticWidget {
|
||||
fn after_render(&self) {}
|
||||
fn get_elem(&self) -> MutexGuard<BoxedElement> {
|
||||
fn get_elem(&'_ self) -> MutexGuard<'_, BoxedElement> {
|
||||
self.element.lock().unwrap()
|
||||
}
|
||||
}
|
||||
@@ -325,7 +325,7 @@ impl StaticWidget {
|
||||
|
||||
impl DynWidget {
|
||||
fn after_render(&self) {}
|
||||
fn get_elem(&self) -> MutexGuard<BoxedElement> {
|
||||
fn get_elem(&'_ self) -> MutexGuard<'_, BoxedElement> {
|
||||
self.element.lock().unwrap()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user