1 files changed, 10 insertions, 28 deletions

diff --git a/crates/material_theme/src/text_editor.rs b/crates/material_theme/src/text_editor.rs
index daad7d2..14d7104 100644
--- a/crates/material_theme/src/text_editor.rs
+++ b/crates/material_theme/src/text_editor.rs
@@ -2,7 +2,7 @@ use iced_widget::core::{Background, Border, Color, border};
 use iced_widget::text_editor::{Catalog, Status, Style, StyleFn};
 
 use super::Theme;
-use crate::utils::DISABLED_TEXT_OPACITY;
+use crate::utils::{disabled_container, disabled_text};
 
 impl Catalog for Theme {
     type Class<'a> = StyleFn<'a, Self>;
@@ -17,23 +17,20 @@ impl Catalog for Theme {
 }
 
 pub fn default(theme: &Theme, status: Status) -> Style {
-    let surface = theme.colorscheme.surface;
-    let primary = theme.colorscheme.primary;
+    let surface = theme.colors().surface;
+    let primary = theme.colors().primary;
 
     let active = Style {
         background: Background::Color(surface.surface_container.highest),
         border: Border {
-            color: theme.colorscheme.outline.color,
+            color: theme.colors().outline.color,
             width: 1.0,
             radius: 4.into(),
         },
         icon: surface.on_surface_variant,
         placeholder: surface.on_surface_variant,
         value: surface.on_surface,
-        selection: Color {
-            a: DISABLED_TEXT_OPACITY,
-            ..primary.color
-        },
+        selection: disabled_text(primary.color),
     };
 
     match status {
@@ -57,29 +54,14 @@ pub fn default(theme: &Theme, status: Status) -> Style {
         Status::Disabled => Style {
             background: Color::TRANSPARENT.into(),
             border: Border {
-                color: Color {
-                    a: DISABLED_TEXT_OPACITY,
-                    ..surface.on_surface
-                },
+                color: disabled_container(surface.on_surface),
                 width: 1.0,
                 radius: border::radius(4),
             },
-            icon: Color {
-                a: DISABLED_TEXT_OPACITY,
-                ..surface.on_surface
-            },
-            placeholder: Color {
-                a: DISABLED_TEXT_OPACITY,
-                ..surface.on_surface
-            },
-            selection: Color {
-                a: DISABLED_TEXT_OPACITY,
-                ..surface.on_surface
-            },
-            value: Color {
-                a: DISABLED_TEXT_OPACITY,
-                ..surface.on_surface
-            },
+            icon: disabled_text(surface.on_surface),
+            placeholder: disabled_text(surface.on_surface),
+            value: disabled_text(surface.on_surface),
+            selection: disabled_text(surface.on_surface),
         },
     }
 }