Merge pull request #148 from kas-gui/work2

Filter list

Author: dhardy

.travis.yml

@@ -229,7 +229,7 @@ impl<'a> draw::SizeHandle for SizeHandle<'a> {
     }
 
     fn edit_surround(&self) -> (Size, Size) {
-        let s = Size::uniform(self.dims.frame as u32);
+        let s = Size::uniform(self.dims.frame as u32 + self.dims.inner_margin as u32);
         (s, s)
     }
 

kas-theme/src/dim.rs

@@ -45,7 +45,7 @@ struct ListEntryGuard(usize);
 impl EditGuard for ListEntryGuard {
     type Msg = EntryMsg;
 
-    fn edit(entry: &mut EditBox<Self>) -> Option<Self::Msg> {
+    fn edit(entry: &mut EditBox<Self>, _: &mut Manager) -> Option<Self::Msg> {
         Some(EntryMsg::Update(entry.guard.0, entry.get_string()))
     }
 }
@@ -99,7 +99,7 @@ fn main() -> Result<(), kas_wgpu::Error> {
         struct {
             #[widget] _ = Label::new("Number of rows:"),
             #[widget(handler = activate)] edit: impl HasString = EditBox::new("3")
-                .on_afl(|text| text.parse::<usize>().ok()),
+                .on_afl(|text, _| text.parse::<usize>().ok()),
             #[widget(handler = button)] _ = TextButton::new("Set", Control::Set),
             #[widget(handler = button)] _ = TextButton::new("−", Control::Decr),
             #[widget(handler = button)] _ = TextButton::new("+", Control::Incr),
@@ -148,7 +148,7 @@ fn main() -> Result<(), kas_wgpu::Error> {
             impl {
                 fn set_len(&mut self, mgr: &mut Manager, len: usize) -> Response<VoidMsg> {
                     let active = self.active;
-                    let old_len = self.list.inner().len();
+                    let old_len = self.list.len();
                     *mgr += self.list.inner_mut().resize_with(len, |n| ListEntry::new(n, n == active));
                     if active >= old_len && active < len {
                         let _ = self.set_radio(mgr, EntryMsg::Select(active));
@@ -159,7 +159,7 @@ fn main() -> Result<(), kas_wgpu::Error> {
                     match msg {
                         EntryMsg::Select(n) => {
                             self.active = n;
-                            let text = self.list.inner()[n].entry.get_string();
+                            let text = self.list[n].entry.get_string();
                             *mgr += self.display.set_string(text);
                         }
                         EntryMsg::Update(n, text) => {

kas-wgpu/examples/dynamic.rs

@@ -5,8 +5,11 @@
 
 //! Filter list example
 
-use kas::widget::view::{ListView, SharedConst};
-use kas::widget::Window;
+use kas::prelude::*;
+use kas::widget::view::{FilterAccessor, ListView, SharedConst};
+use kas::widget::{EditBox, Window};
+use std::cell::RefCell;
+use std::rc::Rc;
 
 const MONTHS: &[&str] = &[
     "January",
@@ -26,8 +29,31 @@ const MONTHS: &[&str] = &[
 fn main() -> Result<(), kas_wgpu::Error> {
     env_logger::init();
 
-    let data: &SharedConst<[&str]> = MONTHS.into();
-    let window = Window::new("Filter-list", ListView::<kas::Down, _>::new(data));
+    type SC = &'static SharedConst<[&'static str]>;
+    type FA = Rc<RefCell<FilterAccessor<usize, SC>>>;
+    let data: SC = MONTHS.into();
+    let data = Rc::new(RefCell::new(FilterAccessor::new_visible(data)));
+    let data2 = data.clone();
+    let window = Window::new(
+        "Filter-list",
+        make_widget! {
+            #[layout(down)]
+            #[handler(msg = VoidMsg)]
+            struct {
+                #[widget] filter = EditBox::new("").on_edit(move |text, mgr| {
+                    // Note: this method of caseless matching is not unicode compliant!
+                    // https://stackoverflow.com/questions/47298336/case-insensitive-string-matching-in-rust
+                    let text = text.to_uppercase();
+                    let update = data2
+                        .borrow_mut()
+                        .update_filter(|s| s.to_uppercase().contains(&text));
+                    mgr.trigger_update(update, 0);
+                    None
+                }),
+                #[widget] list = ListView::<kas::Down, FA>::new(data),
+            }
+        },
+    );
 
     let theme = kas_theme::ShadedTheme::new();
     kas_wgpu::Toolkit::new(theme)?.with(window)?.run()

kas-wgpu/examples/filter-list.rs

@@ -28,11 +28,11 @@ struct Guard;
 impl EditGuard for Guard {
     type Msg = Item;
 
-    fn activate(edit: &mut EditBox<Self>) -> Option<Self::Msg> {
+    fn activate(edit: &mut EditBox<Self>, _: &mut Manager) -> Option<Self::Msg> {
         Some(Item::Edit(edit.get_string()))
     }
 
-    fn edit(edit: &mut EditBox<Self>) -> Option<Self::Msg> {
+    fn edit(edit: &mut EditBox<Self>, _: &mut Manager) -> Option<Self::Msg> {
         // 7a is the colour of *magic*!
         edit.set_error_state(edit.get_str().len() % (7 + 1) == 0);
         None
@@ -233,7 +233,7 @@ fn main() -> Result<(), kas_wgpu::Error> {
                             mgr.adjust_theme(|theme| theme.set_colours(name));
                         }
                         Menu::Disabled(state) => {
-                            *mgr += self.gallery.inner_mut().set_disabled(state);
+                            *mgr += self.gallery.set_disabled(state);
                         }
                         Menu::Quit => {
                             *mgr += TkAction::CloseAll;

kas-wgpu/examples/gallery.rs

@@ -57,7 +57,7 @@ It also supports lists:
                         }
                     };
                     // TODO: this should update the size requirements of the inner area
-                    *mgr += self.label.inner_mut().set_text(text);
+                    *mgr += self.label.set_text(text);
                     Response::None
                 }
             }

kas-wgpu/examples/markdown.rs

@@ -13,7 +13,7 @@ use std::rc::Rc;
 use std::u32;
 
 use super::Align;
-use crate::geom::{Rect, Size};
+use crate::geom::{Coord, Rect, Size};
 
 // for doc use
 #[allow(unused)]
@@ -263,6 +263,26 @@ pub trait Directional: Copy + Sized + std::fmt::Debug + 'static {
     fn is_reversed(self) -> bool {
         ((self.as_direction() as u32) & 2) == 2
     }
+
+    /// Extract a coordinate
+    #[inline]
+    fn extract_coord(self, coord: Coord) -> i32 {
+        if self.is_horizontal() {
+            coord.0
+        } else {
+            coord.1
+        }
+    }
+
+    /// Extract a size
+    #[inline]
+    fn extract_size(self, size: Size) -> u32 {
+        if self.is_horizontal() {
+            size.0
+        } else {
+            size.1
+        }
+    }
 }
 
 macro_rules! fixed {

src/data.rs

@@ -139,10 +139,13 @@ pub trait SizeHandle {
 
     /// The margin around content within a widget
     ///
-    /// This area may be used to draw focus indicators.
+    /// Though inner margins are *usually* empty, they are sometimes drawn to,
+    /// for example focus indicators.
     fn inner_margin(&self) -> Size;
 
     /// The margin between UI elements, where desired
+    ///
+    /// Widgets must not draw in outer margins.
     fn outer_margins(&self) -> Margins;
 
     /// The height of a line of text
@@ -173,10 +176,13 @@ pub trait SizeHandle {
     /// Excludes size of content area.
     fn button_surround(&self) -> (Size, Size);
 
-    /// Size of the sides of an edit box.
+    /// Size of the frame around an edit box, including margin
     ///
-    /// Returns `(top_left, bottom_right)` dimensions as two `Size`s.
-    /// Excludes size of content area.
+    /// Returns two [`Size`] values, `(tl, br)`. `tl` is the size of left and
+    /// top sides, and `br` is the size of right and bottom sides.
+    ///
+    /// Note: though text should not be drawn in the margin, the edit cursor
+    /// may be. The margin included here should be large enough!
     fn edit_surround(&self) -> (Size, Size);
 
     /// Size of the element drawn by [`DrawHandle::checkbox`].

src/draw/handle.rs

@@ -101,6 +101,24 @@ impl std::ops::Add<Size> for Coord {
     }
 }
 
+impl std::ops::Sub<Size> for Coord {
+    type Output = Self;
+
+    #[inline]
+    fn sub(self, other: Size) -> Self {
+        Coord(self.0 - other.0 as i32, self.1 - other.1 as i32)
+    }
+}
+
+impl std::ops::Mul<i32> for Coord {
+    type Output = Self;
+
+    #[inline]
+    fn mul(self, rhs: i32) -> Self {
+        Coord(self.0 * rhs, self.1 * rhs)
+    }
+}
+
 impl From<Coord> for kas_text::Vec2 {
     fn from(pos: Coord) -> kas_text::Vec2 {
         kas_text::Vec2(pos.0 as f32, pos.1 as f32)