From ecf61a93b1fccba498d3ba7bfcb7b390aa20a37f Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 9 Nov 2022 08:03:13 -0700 Subject: [PATCH] Update to use cosmic::theme::Theme --- examples/editor-libcosmic/src/main.rs | 4 ++-- examples/editor-libcosmic/src/text.rs | 15 +++++++++------ examples/editor-libcosmic/src/text_box.rs | 23 +++++++++++++---------- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/examples/editor-libcosmic/src/main.rs b/examples/editor-libcosmic/src/main.rs index 982a357..f41cfc7 100644 --- a/examples/editor-libcosmic/src/main.rs +++ b/examples/editor-libcosmic/src/main.rs @@ -1,15 +1,14 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 use cosmic::{ + Element, iced::{ self, Color, Alignment, Application, Command, - Element, Length, - Theme, widget::{ column, horizontal_space, @@ -18,6 +17,7 @@ use cosmic::{ }, }, settings, + theme::Theme, widget::{ button, toggler, diff --git a/examples/editor-libcosmic/src/text.rs b/examples/editor-libcosmic/src/text.rs index 40a07ad..d24393c 100644 --- a/examples/editor-libcosmic/src/text.rs +++ b/examples/editor-libcosmic/src/text.rs @@ -1,11 +1,14 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 -use cosmic::iced_native::{ - {Color, Element, Length, Point, Rectangle, Size, Theme}, - image, - layout::{self, Layout}, - renderer, - widget::{self, tree, Widget}, +use cosmic::{ + iced_native::{ + {Color, Element, Length, Point, Rectangle, Size}, + image, + layout::{self, Layout}, + renderer, + widget::{self, tree, Widget}, + }, + theme::Theme, }; use cosmic_text::{ Attrs, diff --git a/examples/editor-libcosmic/src/text_box.rs b/examples/editor-libcosmic/src/text_box.rs index 58ee2c0..f4435dd 100644 --- a/examples/editor-libcosmic/src/text_box.rs +++ b/examples/editor-libcosmic/src/text_box.rs @@ -1,15 +1,18 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 -use cosmic::iced_native::{ - {Color, Element, Length, Point, Rectangle, Shell, Size, Theme}, - clipboard::Clipboard, - event::{Event, Status}, - image, - keyboard::{Event as KeyEvent, KeyCode}, - layout::{self, Layout}, - mouse::{self, Button, Event as MouseEvent, ScrollDelta}, - renderer, - widget::{self, tree, Widget}, +use cosmic::{ + iced_native::{ + {Color, Element, Length, Point, Rectangle, Shell, Size}, + clipboard::Clipboard, + event::{Event, Status}, + image, + keyboard::{Event as KeyEvent, KeyCode}, + layout::{self, Layout}, + mouse::{self, Button, Event as MouseEvent, ScrollDelta}, + renderer, + widget::{self, tree, Widget}, + }, + theme::Theme, }; use cosmic_text::{ Action,