Skip to content

Commit

Permalink
use custom theme
Browse files Browse the repository at this point in the history
  • Loading branch information
Redhawk18 committed Jul 13, 2023
1 parent a6c824c commit bfca09c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
6 changes: 4 additions & 2 deletions src/gui/elements.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ use iced::Element;
use iced_aw::menu::{MenuBar, MenuTree};
use iced_aw::{TabBar, TabLabel};

pub fn menu_bar<'a>() -> MenuBar<'a, super::Message, iced::Renderer> {
use crate::gui::theme::Renderer;

pub fn menu_bar<'a>() -> MenuBar<'a, super::Message, Renderer> {
MenuBar::new(vec![file()])
}

fn file<'a>() -> MenuTree<'a, super::Message, iced::Renderer> {
fn file<'a>() -> MenuTree<'a, super::Message, Renderer> {
let new_file = MenuTree::new(button("New File").on_press(super::Message::TabNew(
super::FileTab {
text: std::string::String::default(),
Expand Down
24 changes: 13 additions & 11 deletions src/gui/theme.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
use iced::{application, color};

pub mod mywidget {
use super::Theme;
pub type Renderer = iced::Renderer<Theme>;
pub type Element<'a, Message> = iced::Element<'a, Message, Renderer>;
pub type Container<'a, Message> = iced::widget::Container<'a, Message, Renderer>;
pub type Button<'a, Message> = iced::widget::Button<'a, Message, Renderer>;
pub type Text<'a> = iced::widget::Text<'a, Renderer>;
pub type Row<'a, Message> = iced::widget::Row<'a, Message, Renderer>;
pub type Column<'a, Message> = iced::widget::Column<'a, Message, Renderer>;
pub type Scrollable<'a, Message> = iced::widget::Scrollable<'a, Message, Renderer>;
}
// pub mod mywidget {
// use super::Theme;
// pub type Renderer = iced::Renderer<Theme>;
// pub type Element<'a, Message> = iced::Element<'a, Message, Renderer>;
// pub type Container<'a, Message> = iced::widget::Container<'a, Message, Renderer>;
// pub type Button<'a, Message> = iced::widget::Button<'a, Message, Renderer>;
// pub type Text<'a> = iced::widget::Text<'a, Renderer>;
// pub type Row<'a, Message> = iced::widget::Row<'a, Message, Renderer>;
// pub type Column<'a, Message> = iced::widget::Column<'a, Message, Renderer>;
// pub type Scrollable<'a, Message> = iced::widget::Scrollable<'a, Message, Renderer>;
// }

pub type Renderer = iced::Renderer<Theme>;

#[derive(Debug, Clone, Copy, Default)]
pub enum Theme {
Expand Down

0 comments on commit bfca09c

Please sign in to comment.