me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move Theme type to iced_core

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-03-07 00:14:41 +01:00
parent 7c4bf70023
commit 905f2160e6
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
36 changed files with 43 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

11
widget/src/button.rs
View file

@ -6,21 +6,19 @@ use crate::core::layout;
use crate::core::mouse;
use crate::core::overlay;
use crate::core::renderer;
use crate::core::theme::palette;
use crate::core::touch;
use crate::core::widget::tree::{self, Tree};
use crate::core::widget::Operation;
use crate::core::{
Background, Border, Clipboard, Color, Element, Layout, Length, Padding,
Rectangle, Shadow, Shell, Size, Vector, Widget,
Rectangle, Shadow, Shell, Size, Theme, Vector, Widget,
};
use crate::style::theme::palette;
use crate::style::Theme;
/// A generic widget that produces a message when pressed.
///
/// ```no_run
/// # type Button<'a, Message> =
/// # iced_widget::Button<'a, Message, iced_widget::style::Theme, iced_widget::renderer::Renderer>;
/// # type Button<'a, Message> = iced_widget::Button<'a, Message>;
/// #
/// #[derive(Clone)]
/// enum Message {
@ -34,8 +32,7 @@ use crate::style::Theme;
/// be disabled:
///
/// ```
/// # type Button<'a, Message> =
/// # iced_widget::Button<'a, Message, iced_widget::style::Theme, iced_widget::renderer::Renderer>;
/// # type Button<'a, Message> = iced_widget::Button<'a, Message>;
/// #
/// #[derive(Clone)]
/// enum Message {

8
widget/src/checkbox.rs
View file

@ -5,23 +5,21 @@ use crate::core::layout;
use crate::core::mouse;
use crate::core::renderer;
use crate::core::text;
use crate::core::theme::palette;
use crate::core::touch;
use crate::core::widget;
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Background, Border, Clipboard, Color, Element, Layout, Length, Pixels,
Rectangle, Shell, Size, Widget,
Rectangle, Shell, Size, Theme, Widget,
};
use crate::style::theme::palette;
use crate::style::Theme;
/// A box that can be checked.
///
/// # Example
///
/// ```no_run
/// # type Checkbox<'a, Message> =
/// # iced_widget::Checkbox<'a, Message, iced_widget::style::Theme, iced_widget::renderer::Renderer>;
/// # type Checkbox<'a, Message> = iced_widget::Checkbox<'a, Message>;
/// #
/// pub enum Message {
/// CheckboxToggled(bool),

3
widget/src/combo_box.rs
View file

@ -10,10 +10,9 @@ use crate::core::text;
use crate::core::time::Instant;
use crate::core::widget::{self, Widget};
use crate::core::{
Clipboard, Element, Length, Padding, Rectangle, Shell, Size, Vector,
Clipboard, Element, Length, Padding, Rectangle, Shell, Size, Theme, Vector,
};
use crate::overlay::menu;
use crate::style::Theme;
use crate::text::LineHeight;
use crate::text_input::{self, TextInput};

3
widget/src/container.rs
View file

@ -9,10 +9,9 @@ use crate::core::widget::tree::{self, Tree};
use crate::core::widget::{self, Operation};
use crate::core::{
Background, Border, Clipboard, Color, Element, Layout, Length, Padding,
Pixels, Point, Rectangle, Shadow, Shell, Size, Vector, Widget,
Pixels, Point, Rectangle, Shadow, Shell, Size, Theme, Vector, Widget,
};
use crate::runtime::Command;
use crate::style::Theme;
/// An element decorating some content.
///

3
widget/src/lib.rs
View file

@ -14,7 +14,6 @@ pub use iced_renderer as renderer;
pub use iced_renderer::graphics;
pub use iced_runtime as runtime;
pub use iced_runtime::core;
pub use iced_style as style;
mod column;
mod mouse_area;
@ -135,5 +134,5 @@ pub mod qr_code;
#[doc(no_inline)]
pub use qr_code::QRCode;
pub use crate::core::theme::{self, Theme};
pub use renderer::Renderer;
pub use style::theme::{self, Theme};

3
widget/src/overlay/menu.rs
View file

@ -11,11 +11,10 @@ use crate::core::touch;
use crate::core::widget::Tree;
use crate::core::{
Background, Border, Clipboard, Color, Length, Padding, Pixels, Point,
Rectangle, Size, Vector,
Rectangle, Size, Theme, Vector,
};
use crate::core::{Element, Shell, Widget};
use crate::scrollable::{self, Scrollable};
use crate::style::Theme;
/// A list of selectable options.
#[allow(missing_debug_implementations)]

6
widget/src/pane_grid.rs
View file

@ -40,9 +40,8 @@ use crate::core::widget;
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Background, Border, Clipboard, Color, Element, Layout, Length, Pixels,
Point, Rectangle, Shell, Size, Vector, Widget,
Point, Rectangle, Shell, Size, Theme, Vector, Widget,
};
use crate::style::Theme;
const DRAG_DEADBAND_DISTANCE: f32 = 10.0;
const THICKNESS_RATIO: f32 = 25.0;
@ -71,8 +70,7 @@ const THICKNESS_RATIO: f32 = 25.0;
/// ```no_run
/// # use iced_widget::{pane_grid, text};
/// #
/// # type PaneGrid<'a, Message> =
/// # iced_widget::PaneGrid<'a, Message, iced_widget::style::Theme, iced_widget::renderer::Renderer>;
/// # type PaneGrid<'a, Message> = iced_widget::PaneGrid<'a, Message>;
/// #
/// enum PaneState {
/// SomePane,

3
widget/src/pick_list.rs
View file

@ -11,10 +11,9 @@ use crate::core::touch;
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Background, Border, Clipboard, Color, Element, Layout, Length, Padding,
Pixels, Point, Rectangle, Shell, Size, Vector, Widget,
Pixels, Point, Rectangle, Shell, Size, Theme, Vector, Widget,
};
use crate::overlay::menu::{self, Menu};
use crate::style::Theme;
use std::borrow::Borrow;

5
widget/src/progress_bar.rs
View file

@ -4,9 +4,8 @@ use crate::core::mouse;
use crate::core::renderer;
use crate::core::widget::Tree;
use crate::core::{
Background, Border, Element, Layout, Length, Rectangle, Size, Widget,
Background, Border, Element, Layout, Length, Rectangle, Size, Theme, Widget,
};
use crate::style::Theme;
use std::ops::RangeInclusive;
@ -14,7 +13,7 @@ use std::ops::RangeInclusive;
///
/// # Example
/// ```no_run
/// # type ProgressBar = iced_widget::ProgressBar<iced_widget::style::Theme>;
/// # type ProgressBar = iced_widget::ProgressBar;
/// #
/// let value = 50.0;
///

4
widget/src/qr_code.rs
View file

@ -5,10 +5,10 @@ use crate::core::mouse;
use crate::core::renderer::{self, Renderer as _};
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Color, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
Color, Element, Layout, Length, Point, Rectangle, Size, Theme, Vector,
Widget,
};
use crate::graphics::geometry::Renderer as _;
use crate::style::Theme;
use crate::Renderer;
use std::cell::RefCell;

5
widget/src/radio.rs
View file

@ -10,16 +10,15 @@ use crate::core::widget;
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Background, Border, Clipboard, Color, Element, Layout, Length, Pixels,
Rectangle, Shell, Size, Widget,
Rectangle, Shell, Size, Theme, Widget,
};
use crate::style::Theme;
/// A circular button representing a choice.
///
/// # Example
/// ```no_run
/// # type Radio<Message> =
/// # iced_widget::Radio<Message, iced_widget::style::Theme, iced_widget::renderer::Renderer>;
/// # iced_widget::Radio<Message, iced_widget::Theme, iced_widget::renderer::Renderer>;
/// #
/// # use iced_widget::column;
/// #[derive(Debug, Clone, Copy, PartialEq, Eq)]

3
widget/src/rule.rs
View file

@ -5,9 +5,8 @@ use crate::core::mouse;
use crate::core::renderer;
use crate::core::widget::Tree;
use crate::core::{
Color, Element, Layout, Length, Pixels, Rectangle, Size, Widget,
Color, Element, Layout, Length, Pixels, Rectangle, Size, Theme, Widget,
};
use crate::style::Theme;
/// Display a horizontal or vertical rule for dividing content.
#[allow(missing_debug_implementations)]

3
widget/src/scrollable.rs
View file

@ -13,10 +13,9 @@ use crate::core::widget::operation::{self, Operation};
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Background, Border, Clipboard, Color, Element, Layout, Length, Pixels,
Point, Rectangle, Shell, Size, Vector, Widget,
Point, Rectangle, Shell, Size, Theme, Vector, Widget,
};
use crate::runtime::Command;
use crate::style::Theme;
pub use operation::scrollable::{AbsoluteOffset, RelativeOffset};

6
widget/src/slider.rs
View file

@ -12,9 +12,8 @@ use crate::core::touch;
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Border, Clipboard, Color, Element, Layout, Length, Pixels, Point,
Rectangle, Shell, Size, Widget,
Rectangle, Shell, Size, Theme, Widget,
};
use crate::style::Theme;
use std::ops::RangeInclusive;
@ -28,8 +27,7 @@ use std::ops::RangeInclusive;
///
/// # Example
/// ```no_run
/// # type Slider<'a, T, Message> =
/// # iced_widget::Slider<'a, Message, T, iced_widget::style::Theme>;
/// # type Slider<'a, T, Message> = iced_widget::Slider<'a, Message, T>;
/// #
/// #[derive(Clone)]
/// pub enum Message {

4
widget/src/svg.rs
View file

@ -5,9 +5,9 @@ use crate::core::renderer;
use crate::core::svg;
use crate::core::widget::Tree;
use crate::core::{
Color, ContentFit, Element, Layout, Length, Rectangle, Size, Vector, Widget,
Color, ContentFit, Element, Layout, Length, Rectangle, Size, Theme, Vector,
Widget,
};
use crate::style::Theme;
use std::path::PathBuf;

3
widget/src/text_editor.rs
View file

@ -12,9 +12,8 @@ use crate::core::text::{self, LineHeight};
use crate::core::widget::{self, Widget};
use crate::core::{
Background, Border, Color, Element, Length, Padding, Pixels, Rectangle,
Shell, Size, Vector,
Shell, Size, Theme, Vector,
};
use crate::style::Theme;
use std::cell::RefCell;
use std::fmt;

6
widget/src/text_input.rs
View file

@ -28,17 +28,15 @@ use crate::core::widget::tree::{self, Tree};
use crate::core::window;
use crate::core::{
Background, Border, Color, Element, Layout, Length, Padding, Pixels, Point,
Rectangle, Shell, Size, Vector, Widget,
Rectangle, Shell, Size, Theme, Vector, Widget,
};
use crate::runtime::Command;
use crate::style::Theme;
/// A field that can be filled with text.
///
/// # Example
/// ```no_run
/// # pub type TextInput<'a, Message> =
/// # iced_widget::TextInput<'a, Message, iced_widget::style::Theme, iced_widget::renderer::Renderer>;
/// # pub type TextInput<'a, Message> = iced_widget::TextInput<'a, Message>;
/// #
/// #[derive(Debug, Clone)]
/// enum Message {

6
widget/src/toggler.rs
View file

@ -10,17 +10,15 @@ use crate::core::widget;
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Border, Clipboard, Color, Element, Event, Layout, Length, Pixels,
Rectangle, Shell, Size, Widget,
Rectangle, Shell, Size, Theme, Widget,
};
use crate::style::Theme;
/// A toggler widget.
///
/// # Example
///
/// ```no_run
/// # type Toggler<'a, Message> =
/// # iced_widget::Toggler<'a, Message, iced_widget::style::Theme, iced_widget::renderer::Renderer>;
/// # type Toggler<'a, Message> = iced_widget::Toggler<'a, Message>;
/// #
/// pub enum Message {
/// TogglerToggled(bool),

3
widget/src/vertical_slider.rs
View file

@ -31,8 +31,7 @@ use crate::core::{
///
/// # Example
/// ```no_run
/// # type VerticalSlider<'a, T, Message> =
/// # iced_widget::VerticalSlider<'a, T, Message, iced_widget::style::Theme>;
/// # type VerticalSlider<'a, T, Message> = iced_widget::VerticalSlider<'a, T, Message>;
/// #
/// #[derive(Clone)]
/// pub enum Message {