From 56d9c3521599baef6ff1472c0c95fa07f17a5a67 Mon Sep 17 00:00:00 2001 From: rabite Date: Tue, 12 Feb 2019 22:55:16 +0100 Subject: async widget --- src/tabview.rs | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'src/tabview.rs') diff --git a/src/tabview.rs b/src/tabview.rs index 59e5872..39286a0 100644 --- a/src/tabview.rs +++ b/src/tabview.rs @@ -10,15 +10,15 @@ pub trait Tabbable { #[derive(PartialEq)] -pub struct TabView where T: Widget { +pub struct TabView where T: Widget, T: Tabbable { widgets: Vec, active: usize, coordinates: Coordinates } -impl TabView where T: Widget + Tabbable { - pub fn new() -> Self { - Self { +impl TabView where T: Widget, T: Tabbable { + pub fn new() -> TabView { + TabView { widgets: vec![], active: 0, coordinates: Coordinates::new() @@ -67,7 +67,7 @@ impl TabView where T: Widget + Tabbable { } } -impl Widget for TabView where T: Widget + Tabbable + PartialEq { +impl Widget for TabView where T: Widget + Tabbable { fn render_header(&self) -> String { let xsize = self.get_coordinates().xsize(); let header = self.active_widget().render_header(); @@ -106,18 +106,6 @@ impl Widget for TabView where T: Widget + Tabbable + PartialEq { self.active_widget().get_drawlist() } - fn get_size(&self) -> &Size { - &self.coordinates.size - } - fn get_position(&self) -> &Position { - &self.coordinates.position - } - fn set_size(&mut self, size: Size) { - self.coordinates.size = size; - } - fn set_position(&mut self, position: Position) { - self.coordinates.position = position; - } fn get_coordinates(&self) -> &Coordinates { &self.coordinates } -- cgit v1.2.3