shadowcat/openworm
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update iris & get button working again

Browse Source
This commit is contained in:
Shadow Cat
2026-01-19 21:26:59 -05:00
parent 040b70e1c5
commit e67c55d67d
8 changed files with 213 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/bin/client/ui/misc.rs
View File

@@ -1,6 +1,6 @@
use super::*;
pub fn werror(msg: &str, rsc: &mut Rsc) -> WidgetHandle {
pub fn werror(msg: &str, rsc: &mut Rsc) -> StrongWidget {
wtext(msg)
.size(20)
.pad(10)
@@ -12,7 +12,7 @@ pub fn hint(msg: impl Into<String>) -> TextBuilder<Rsc> {
wtext(msg).size(20).color(Color::GRAY)
}
pub fn field_widget(name: &str, hint_text: &str, rsc: &mut Rsc) -> WidgetRef<TextEdit> {
pub fn field_widget(name: &str, hint_text: &str, rsc: &mut Rsc) -> WeakWidget<TextEdit> {
wtext(name)
.editable(EditMode::SingleLine)
.size(20)
@@ -20,7 +20,7 @@ pub fn field_widget(name: &str, hint_text: &str, rsc: &mut Rsc) -> WidgetRef<Tex
.add(rsc)
}
pub fn field_box(field: WidgetRef<TextEdit>, rsc: &mut Rsc) -> WidgetRef {
pub fn field_box(field: WeakWidget<TextEdit>, rsc: &mut Rsc) -> WeakWidget {
field
.pad(10)
.background(rect(Color::BLACK.brighter(0.1)).radius(15))
@@ -31,55 +31,48 @@ pub fn field_box(field: WidgetRef<TextEdit>, rsc: &mut Rsc) -> WidgetRef {
#[derive(Clone, Copy, WidgetView)]
pub struct Button {
#[root]
root: WidgetRef,
rect: WidgetRef<Rect>,
enabled: Handle<bool>,
root: WeakWidget,
rect: WeakWidget<Rect>,
color: UiColor,
enabled: WeakState<bool>,
}
// impl WidgetView for Button {
// fn view(&self) -> &WidgetRef<Self::Widget> {
// &self.root
// }
// }
impl Button {
pub fn new(text: &str, color: UiColor, rsc: &mut Rsc) -> Self {
let rect = rect(color).radius(15).add(rsc);
// let enabled = Handle::from(true);
// let enabled_ = enabled.clone();
// let enabled__ = enabled.clone();
let enabled = rsc.create_state(rect, true);
let root = rect
.on(
CursorSense::HoverStart | CursorSense::unclick(),
move |ctx, rsc: &mut Rsc| {
// if !*enabled_.get() {
// return;
// }
rsc.ui[ctx.widget].color = color.brighter(0.1);
if !rsc[enabled] {
return;
}
rsc[ctx.widget].color = color.brighter(0.1);
},
)
.on(CursorSense::HoverEnd, move |ctx, rsc| {
// if !*enabled__.get() {
// return;
// }
rsc.ui[ctx.widget].color = color;
if !rsc[enabled] {
return;
}
rsc[ctx.widget].color = color;
})
.height(60)
.foreground(wtext(text).size(25).text_align(Align::CENTER))
.add(rsc);
// let enabled_ = enabled.clone();
rect.on(CursorSense::click(), move |ctx, rsc: &mut Rsc| {
// if !*enabled_.get() {
// return;
// }
rsc.ui[ctx.widget].color = color.darker(0.2);
if !rsc[enabled] {
return;
}
rsc[ctx.widget].color = color.darker(0.2);
rsc.run_event::<Submit>(root, (), ctx.state);
})
.add(rsc);
Self {
root,
rect,
// enabled,
color,
enabled,
}
}
@@ -88,21 +81,21 @@ impl Button {
}
pub fn disable(&self, rsc: &mut Rsc) {
*self.enabled.get_mut() = false;
self.rect.get_mut().color = self.color.darker(0.8);
rsc[self.enabled] = false;
rsc[self.rect].color = self.color.darker(0.8);
}
}
widget_trait! {
pub trait Stuff<Rsc: HasUi + 'static>;
pub trait Stuff<Rsc: UiRsc + 'static>;
fn modal(self, width: impl UiNum) -> impl WidgetIdFn<Rsc> {
|ui| {
|rsc| {
self
.pad(15)
.background(rect(color::MODAL_BG).radius(15))
.width(width)
.align(Align::CENTER)
.add(ui)
.add(rsc)
}
}
}