Commit 8a06ddb3 authored by Florian Blasius's avatar Florian Blasius 🤘

[fix] name conflict widget macro and widget module

parent df6947e3
......@@ -18,7 +18,7 @@ use crate::{
EventSystem, InitSystem, LayoutSystem, PostLayoutStateSystem, RenderSystem, StateSystem,
},
theme::Theme,
widget::{State, BuildContext, Widget},
widgets::{State, BuildContext, Widget},
Global,
};
......
......@@ -15,7 +15,7 @@ use orbgl_api::prelude::Canvas;
use crate::{
application::Tree, event::EventQueue, properties::Bounds, structs::Point, theme::Theme,
widget::MessageBox,
widgets::MessageBox,
};
/// Provides the context for the `InitSystem`.
......
......@@ -19,7 +19,7 @@ use crate::event::{
use crate::properties::Bounds;
use crate::structs::{Point, Position, Size};
use crate::theme::Theme;
use crate::widget::MessageBox;
use crate::widgets::MessageBox;
/// Implementation of the OrbClient based backend.
pub struct OrbitalBackend {
......
......@@ -4,7 +4,7 @@ use crate::{
event::{Event, EventBox, EventHandler},
properties::*,
structs::*,
widget::{Widget, WidgetContainer},
widgets::{Widget, WidgetContainer},
};
/// Checks if the given point is inside of a widget.
......
......@@ -16,7 +16,7 @@ use crate::{
enums::Alignment,
structs::{DirtySize, Size},
theme::Theme,
widget::WidgetContainer,
widgets::WidgetContainer,
};
use super::Layout;
......
......@@ -12,7 +12,7 @@ use crate::{
properties::*,
structs::{DirtySize, Size, Spacer},
theme::Theme,
widget::WidgetContainer,
widgets::WidgetContainer,
};
use super::Layout;
......
......@@ -21,7 +21,7 @@ pub use crate::styling::theme::{DEFAULT_THEME_CSS, LIGHT_THEME_EXTENSION_CSS};
pub use crate::styling::vector_graphics::*;
pub use crate::systems::*;
pub use crate::theme::*;
pub use crate::widget::*;
pub use crate::widgets::*;
pub use dces::prelude::*;
......@@ -36,4 +36,4 @@ pub mod structs;
pub mod styling;
pub mod systems;
pub mod theme;
pub mod widget;
pub mod widgets;
......@@ -47,7 +47,7 @@ macro_rules! widget {
use crate::{event::EventHandler,
properties::{PropertySource, Bounds, Constraint, VerticalAlignment, HorizontalAlignment, Visibility, Name},
widget::{Widget, BuildContext},
widgets::{Widget, BuildContext},
structs::Point};
$(#[$widget_doc])*
......
......@@ -5,7 +5,7 @@ use crate::{
properties::{Bounds, FontIcon, IconBrush, IconFont, IconSize},
render_object::RenderObject,
structs::Point,
widget::Context,
widgets::Context,
};
pub struct FontIconRenderObject;
......
......@@ -5,7 +5,7 @@ use crate::{
properties::{Bounds, Image},
render_object::RenderObject,
structs::{Point, Size},
widget::Context,
widgets::Context,
};
/// Used to render an image.
......
......@@ -6,7 +6,7 @@ use orbgl_api::Canvas;
use crate::backend::Renderer;
use crate::structs::Point;
use crate::widget::Context;
use crate::widgets::Context;
pub use self::font_icon::*;
pub use self::image::*;
......
......@@ -5,7 +5,7 @@ use crate::{
properties::*,
render_object::RenderObject,
structs::{Point, Brush, Position, Size, Thickness},
widget::Context,
widgets::Context,
};
pub struct RectangleRenderObject;
......
......@@ -5,7 +5,7 @@ use crate::{
properties::*,
render_object::RenderObject,
structs::Point,
widget::Context,
widgets::Context,
};
/// Used to render a text.
......
......@@ -16,7 +16,7 @@ use crate::{
},
properties::{Bounds, Constraint, Enabled, Focused, Pressed, Selected, ConstraintExtension},
structs::Size,
widget::WidgetContainer,
widgets::WidgetContainer,
Global,
};
......
......@@ -6,7 +6,7 @@ use crate::{
application::{Global, Tree},
backend::Backend,
properties::*,
widget::{Context, State},
widgets::{Context, State},
};
/// This system is used to initializes the widgets.
......
......@@ -12,7 +12,7 @@ use crate::{
properties::*,
render_object::RenderObject,
structs::{Point, Position},
widget::Context,
widgets::Context,
};
/// The `RenderSystem` iterates over all visual widgets and used its render objects to draw them on the screen.
......
......@@ -10,7 +10,7 @@ use crate::{
application::Tree,
backend::Backend,
properties::*,
widget::{
widgets::{
add_selector_to_widget, remove_selector_from_widget, Context, State, WidgetContainer,
},
};
......
......@@ -14,7 +14,7 @@ use crate::{
fonts,
theme::{DEFAULT_THEME_CSS, LIGHT_THEME_EXTENSION_CSS},
},
widget::WidgetContainer,
widgets::WidgetContainer,
};
lazy_static! {
......
......@@ -4,7 +4,7 @@ use crate::{
event::ClickHandler,
properties::*,
styling::{colors, fonts},
widget::{Container, FontIconBlock, Stack, Template, TextBlock},
widgets::{Container, FontIconBlock, Stack, Template, TextBlock},
};
widget!(
......
......@@ -2,7 +2,7 @@
// layout::FixedSizeLayout,
// render_object::ImageRenderObject,
// theme::Selector,
// widget::{Template, Widget},
// widgets::{Template, Widget},
// };
// // Unused at the moment!!!
......
......@@ -5,7 +5,7 @@ use crate::{
material_font_icons,
properties::*,
styling::{colors, fonts},
widget::{Container, FontIconBlock, Stack, Template, TextBlock},
widgets::{Container, FontIconBlock, Stack, Template, TextBlock},
};
widget!(
......
use dces::prelude::Entity;
use crate::{properties::*, widget::Template, render_object::{RenderObject, RectangleRenderObject}, layout::{Layout, PaddingLayout}};
use crate::{properties::*, widgets::Template, render_object::{RenderObject, RectangleRenderObject}, layout::{Layout, PaddingLayout}};
widget!(
/// The `Container` layout widget surrounds its child with a padding. Draws a box around the child.
......
......@@ -5,7 +5,7 @@ use crate::{
properties::*,
render_object::{RenderObject, RectangleRenderObject},
styling::fonts,
widget::{Template, State, Context, add_selector_to_widget, remove_selector_from_widget},
widgets::{Template, State, Context, add_selector_to_widget, remove_selector_from_widget},
};
// Default state of the `Cursor` widget.
......
......@@ -5,7 +5,7 @@ use crate::{
properties::*,
render_object::{FontIconRenderObject, RenderObject},
styling::{colors, fonts},
widget::Template,
widgets::Template,
};
widget!(
......
......@@ -4,7 +4,7 @@ use crate::{
layout::{GridLayout, Layout},
properties::*,
render_object::{RenderObject, RectangleRenderObject},
widget::Template,
widgets::Template,
};
widget!(
......
......@@ -4,7 +4,7 @@ use crate::{
layout::{FixedSizeLayout, Layout},
properties::*,
render_object::{RenderObject, ImageRenderObject},
widget::Template,
widgets::Template,
};
widget!(
......
......@@ -2,7 +2,7 @@
pub use self::button::*;
pub use self::core::*;
// pub use self::canvas_widget::CanvasWidget;
// pub use self::canvas_widgets::CanvasWidget;
pub use self::check_box::*;
pub use self::container::*;
pub use self::cursor::*;
......
......@@ -3,7 +3,7 @@ use dces::prelude::Entity;
use crate::{
layout::{Layout, ScrollLayout},
properties::*,
widget::Template,
widgets::Template,
};
widget!(
......
......@@ -3,7 +3,7 @@ use dces::prelude::Entity;
use crate::{
layout::{Layout, StackLayout},
properties::*,
widget::Template,
widgets::Template,
};
widget!(
......
......@@ -3,7 +3,7 @@ use dces::prelude::Entity;
use crate::{
properties::*,
styling::colors,
widget::{Container, Grid, Template, State, Context},
widgets::{Container, Grid, Template, State, Context},
};
/// State to handle the position of switch toggle.
......
......@@ -5,7 +5,7 @@ use crate::{
properties::*,
render_object::{RenderObject, TextRenderObject},
styling::{colors, fonts},
widget::Template,
widgets::Template,
};
widget!(
......
......@@ -7,7 +7,7 @@ use crate::{
properties::*,
structs::*,
styling::{colors, fonts},
widget::*,
widgets::*,
};
/// The `TextBoxState` handles the text processing of the `TextBox` widget.
......
......@@ -4,7 +4,7 @@ use crate::{
event::ClickHandler,
properties::*,
styling::{colors, fonts},
widget::{Container, FontIconBlock, Stack, Template, TextBlock},
widgets::{Container, FontIconBlock, Stack, Template, TextBlock},
};
widget!(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment