wip

Author: DashieTM

oxirun/Cargo.lock

@@ -7,7 +7,8 @@ license = "GPL-3.0-only"
 
 [dependencies]
 oxilib = "0.1.2"
-oxiced = "0.4.0"
+# oxiced = "0.4.0"
+oxiced = { version = "0.4.0", path = "/home/dashie/gits/oxiced" }
 iced = { version = "0.13.1", features = ["advanced", "canvas", "image", "svg"] }
 iced_layershell = "0.12.0"                                                       # broken on later versions
 xdg = "3.0.0"

oxirun/Cargo.toml

@@ -5,8 +5,7 @@ use iced::keyboard::Modifiers;
 use iced::keyboard::key::Named;
 use iced::widget::{Column, Row, button, text};
 use iced::{Element, Length, Subscription, Task, Theme, event};
-use oxiced::theme::get_theme;
-use oxiced::widgets::common::{darken_color, lighten_color};
+use oxiced::theme::theme::{get_derived_iced_theme, OXITHEME};
 use oxiced::widgets::oxi_button::{self, ButtonVariant};
 use oxiced::widgets::oxi_text_input::text_input;
 
@@ -57,7 +56,7 @@ struct OxiRun {
 impl Default for OxiRun {
     fn default() -> Self {
         Self {
-            theme: get_theme(),
+            theme: get_derived_iced_theme(),
             filter_text: "".into(),
             plugins: HashMap::new(),
             current_focus: 0,
@@ -136,14 +135,14 @@ fn content_button(
         .on_press(Message::LaunchEntry(current_index))
         .style(move |theme, status| {
             let is_focused = current_index == focused_index;
-            let palette = theme.extended_palette().primary;
-            let default_style = oxi_button::primary_button(theme, status);
+            let palette = OXITHEME;
+            let default_style = oxi_button::row_entry(theme, status);
             let background = if status == button::Status::Hovered {
-                Some(iced::Background::Color(darken_color(palette.base.color)))
+                Some(iced::Background::Color(palette.secondary_bg_active))
             } else if is_focused {
-                default_style.background
+                Some(iced::Background::Color(palette.secondary_bg_hover))
             } else {
-                Some(iced::Background::Color(lighten_color(palette.base.color)))
+                Some(iced::Background::Color(palette.secondary_bg))
             };
             iced::widget::button::Style {
                 background,
@@ -351,11 +350,11 @@ impl Application for OxiRun {
     }
 
     // remove the annoying background color
-    fn style(&self, theme: &Self::Theme) -> iced_layershell::Appearance {
-        let palette = theme.extended_palette();
+    fn style(&self, _: &Self::Theme) -> iced_layershell::Appearance {
+        let palette = OXITHEME;
         iced_layershell::Appearance {
             background_color: iced::Color::TRANSPARENT,
-            text_color: palette.background.base.text,
+            text_color: palette.text
         }
     }
 

oxirun/src/main.rs

@@ -1,6 +1,7 @@
 use iced::{
     Alignment, Element, Length, Renderer, Theme, widget::container, widget::container::Style,
 };
+use oxiced::theme::theme::OXITHEME;
 
 use crate::Message;
 
@@ -37,12 +38,12 @@ impl FocusDirection {
 }
 
 fn box_style(theme: &Theme) -> Style {
-    let palette = theme.extended_palette();
+    let palette = OXITHEME;
     Style {
         background: Some(iced::Background::Color(
-            palette.background.base.color,
+            palette.base
         )),
-        border: iced::border::color(palette.primary.strong.color).width(5).rounded(10),
+        border: iced::border::color(palette.primary).width(5).rounded(palette.border_radius),
         ..container::rounded_box(theme)
     }
 }