changed click with clicked
This commit is contained in:
+3
-3
@@ -43,7 +43,7 @@ pub mod prelude {
|
|||||||
pub use crate::{self as osui, css, rsx, rsx_elem, ui::*, Handler};
|
pub use crate::{self as osui, css, rsx, rsx_elem, ui::*, Handler};
|
||||||
pub use crate::{Element, Value};
|
pub use crate::{Element, Value};
|
||||||
// useful for Element making
|
// useful for Element making
|
||||||
pub use crate::{run_handler, Children, Component, ElementCore};
|
pub use crate::{run_handler, Children, ElementCore, ElementWidget};
|
||||||
pub use crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind};
|
pub use crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind};
|
||||||
pub fn sleep(ms: u64) {
|
pub fn sleep(ms: u64) {
|
||||||
std::thread::sleep(std::time::Duration::from_millis(ms));
|
std::thread::sleep(std::time::Duration::from_millis(ms));
|
||||||
@@ -93,7 +93,7 @@ pub trait ElementCore: Send + Sync {
|
|||||||
fn set_styling(&mut self, styling: &HashMap<crate::ui::StyleName, crate::ui::Style>);
|
fn set_styling(&mut self, styling: &HashMap<crate::ui::StyleName, crate::ui::Style>);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait Component: ElementCore + std::fmt::Debug {
|
pub trait ElementWidget: ElementCore + std::fmt::Debug {
|
||||||
fn render(&self, focused: bool) -> String {
|
fn render(&self, focused: bool) -> String {
|
||||||
_ = focused;
|
_ = focused;
|
||||||
String::new()
|
String::new()
|
||||||
@@ -104,7 +104,7 @@ pub trait Component: ElementCore + std::fmt::Debug {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub type Element = Box<dyn Component>;
|
pub type Element = Box<dyn ElementWidget>;
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
/// Handler Struct
|
/// Handler Struct
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ fn app() -> Element {
|
|||||||
|
|
||||||
fn styles() -> Css {
|
fn styles() -> Css {
|
||||||
css! {
|
css! {
|
||||||
.btn::click {
|
.btn::clicked {
|
||||||
color: Blue
|
color: Blue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -28,7 +28,7 @@ use osui_element::{elem_fn, element};
|
|||||||
#[derive(Default, Debug)]
|
#[derive(Default, Debug)]
|
||||||
pub struct Text {}
|
pub struct Text {}
|
||||||
|
|
||||||
impl Component for Text<'_> {
|
impl ElementWidget for Text<'_> {
|
||||||
fn render(&self, _: bool) -> String {
|
fn render(&self, _: bool) -> String {
|
||||||
if let Children::Text(text) = &self.children {
|
if let Children::Text(text) = &self.children {
|
||||||
text.clone()
|
text.clone()
|
||||||
@@ -65,7 +65,7 @@ pub struct Div {
|
|||||||
pub styling: Option<std::collections::HashMap<StyleName, Style>>,
|
pub styling: Option<std::collections::HashMap<StyleName, Style>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Component for Div<'_> {
|
impl ElementWidget for Div<'_> {
|
||||||
fn render(&self, focused: bool) -> String {
|
fn render(&self, focused: bool) -> String {
|
||||||
let mut frame = crate::utils::create_frame(self.width.get_value(), self.height.get_value());
|
let mut frame = crate::utils::create_frame(self.width.get_value(), self.height.get_value());
|
||||||
|
|
||||||
@@ -141,10 +141,10 @@ pub struct Button {
|
|||||||
pub state: &'a str,
|
pub state: &'a str,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Component for Button<'_> {
|
impl ElementWidget for Button<'_> {
|
||||||
fn render(&self, focused: bool) -> String {
|
fn render(&self, focused: bool) -> String {
|
||||||
if self.state == "clicked" {
|
if self.state == "clicked" {
|
||||||
return self.style.write("click", &self.children.get_text());
|
return self.style.write("clicked", &self.children.get_text());
|
||||||
}
|
}
|
||||||
if focused {
|
if focused {
|
||||||
self.style.write("hover", &self.children.get_text())
|
self.style.write("hover", &self.children.get_text())
|
||||||
|
|||||||
Reference in New Issue
Block a user