summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPolesznyák Márk <contact@pml68.dev>2025-11-22 08:40:09 +0100
committerPolesznyák Márk <contact@pml68.dev>2025-11-22 08:40:09 +0100
commit5801d7253e199b842270476ee0af8d0d0d0f4dc9 (patch)
tree80482c98341f26971bac872b9566e54891431c06
parentchore: update deps (diff)
downloadiced-builder-5801d7253e199b842270476ee0af8d0d0d0f4dc9.tar.gz
chore: update iced_material
-rw-r--r--Cargo.lock32
-rw-r--r--src/main.rs2
-rw-r--r--src/panes/code_view.rs18
-rw-r--r--src/panes/style.rs12
-rw-r--r--src/widget/button.rs8
5 files changed, 36 insertions, 36 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e89b628..6c1d9c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1947,7 +1947,7 @@ dependencies = [
[[package]]
name = "iced"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"iced_core",
"iced_debug",
@@ -2008,7 +2008,7 @@ dependencies = [
[[package]]
name = "iced_core"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"bitflags 2.10.0",
"bytes",
@@ -2025,7 +2025,7 @@ dependencies = [
[[package]]
name = "iced_custom_highlighter"
version = "0.1.0"
-source = "git+https://git.sr.ht/~pml68/iced_custom_highlighter#3b528bdb7070522212e2a2c504d6361df76ed582"
+source = "git+https://git.sr.ht/~pml68/iced_custom_highlighter#c00bf0c697439a789d28cdbaa56371ebd1da4916"
dependencies = [
"iced_core",
"syntect",
@@ -2035,7 +2035,7 @@ dependencies = [
[[package]]
name = "iced_debug"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"iced_core",
"iced_futures",
@@ -2045,7 +2045,7 @@ dependencies = [
[[package]]
name = "iced_dialog"
version = "0.14.0-dev"
-source = "git+https://git.sr.ht/~pml68/iced_dialog?branch=master#06fd88a8c59af0d2d7d435d336fc9dd3e96aebe7"
+source = "git+https://git.sr.ht/~pml68/iced_dialog?branch=master#619c81797b89847c39ffc17db2fa2340215d2ea3"
dependencies = [
"iced_core",
"iced_widget",
@@ -2075,7 +2075,7 @@ dependencies = [
[[package]]
name = "iced_futures"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"futures",
"iced_core",
@@ -2089,7 +2089,7 @@ dependencies = [
[[package]]
name = "iced_graphics"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"bitflags 2.10.0",
"bytemuck",
@@ -2108,8 +2108,8 @@ dependencies = [
[[package]]
name = "iced_material"
-version = "0.14.0-dev"
-source = "git+https://git.sr.ht/~pml68/iced_material?branch=master#849cc869be51ccf79b603662fb7db13c241fbc9a"
+version = "0.1.0"
+source = "git+https://git.sr.ht/~pml68/iced_material?branch=master#ff7e17988d5868c72cfb39d09ccf4efb05d3ceda"
dependencies = [
"iced_anim",
"iced_dialog",
@@ -2121,7 +2121,7 @@ dependencies = [
[[package]]
name = "iced_program"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"iced_graphics",
"iced_runtime",
@@ -2130,7 +2130,7 @@ dependencies = [
[[package]]
name = "iced_renderer"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@@ -2142,7 +2142,7 @@ dependencies = [
[[package]]
name = "iced_runtime"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"bytes",
"iced_core",
@@ -2154,7 +2154,7 @@ dependencies = [
[[package]]
name = "iced_tiny_skia"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"bytemuck",
"cosmic-text",
@@ -2171,7 +2171,7 @@ dependencies = [
[[package]]
name = "iced_wgpu"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"bitflags 2.10.0",
"bytemuck",
@@ -2191,7 +2191,7 @@ dependencies = [
[[package]]
name = "iced_widget"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"iced_renderer",
"log",
@@ -2204,7 +2204,7 @@ dependencies = [
[[package]]
name = "iced_winit"
version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c67f5238188db770e362de9e37f692f6938dbc71"
+source = "git+https://github.com/iced-rs/iced?branch=master#8bfd099c5929d927a3fdde666d4c645d0bd83cb7"
dependencies = [
"iced_debug",
"iced_program",
diff --git a/src/main.rs b/src/main.rs
index 1908591..55b647c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -526,7 +526,7 @@ impl IcedBuilder {
.padding([5, 10])
.width(Length::Fill)
.style(|theme: &Theme| {
- let color = theme.colors().surface.on_surface;
+ let color = theme.colors().surface.text;
container::Style {
background: Some(
disabled_container(color).into(),
diff --git a/src/panes/code_view.rs b/src/panes/code_view.rs
index 2dc27e9..dbc7ada 100644
--- a/src/panes/code_view.rs
+++ b/src/panes/code_view.rs
@@ -40,7 +40,7 @@ fn highlight_style(theme: &Theme, scope: &Scope) -> Format<Font> {
| Scope::EscapeSequence => colors.tertiary.color,
// Regex deserves distinct treatment, often looking like code but acting like a string
- Scope::RegExp => colors.secondary.secondary_container,
+ Scope::RegExp => colors.secondary.container,
// Numeric literals and constants (user- or built-in)
Scope::Number | Scope::BuiltinConstant | Scope::UserDefinedConstant => {
@@ -54,7 +54,7 @@ fn highlight_style(theme: &Theme, scope: &Scope) -> Format<Font> {
// Function and method declarations
Scope::FunctionName | Scope::LibraryFunction => {
- colors.primary.primary_container
+ colors.primary.container
}
// Keywords and language operators
@@ -62,14 +62,14 @@ fn highlight_style(theme: &Theme, scope: &Scope) -> Format<Font> {
| Scope::KeywordOperator
| Scope::KeywordOther
| Scope::Operator
- | Scope::Continuation => colors.secondary.secondary_container,
+ | Scope::Continuation => colors.secondary.container,
// Module/class/namespace declarations
Scope::Class
| Scope::LibraryClass
| Scope::StorageType
| Scope::StorageModifier
- | Scope::Storage => colors.tertiary.tertiary_container,
+ | Scope::Storage => colors.tertiary.container,
// Import paths or directives
Scope::Import => colors.tertiary.color,
@@ -78,7 +78,7 @@ fn highlight_style(theme: &Theme, scope: &Scope) -> Format<Font> {
Scope::Exception | Scope::Invalid => colors.error.color,
// HTML-like tags or markup tokens
- Scope::TagName | Scope::TagStart => colors.primary.primary_container,
+ Scope::TagName | Scope::TagStart => colors.primary.container,
// Special constants, macros, etc.
Scope::Special | Scope::SupportConstruct => {
@@ -91,7 +91,7 @@ fn highlight_style(theme: &Theme, scope: &Scope) -> Format<Font> {
}
// Fallback
- Scope::Other => colors.surface.on_surface_variant,
+ Scope::Other => colors.surface.text_variant,
// Handle user-defined custom scope
Scope::Custom { name, .. } => {
@@ -102,12 +102,12 @@ fn highlight_style(theme: &Theme, scope: &Scope) -> Format<Font> {
} else if name.contains("string") {
colors.tertiary.color
} else if name.contains("keyword") {
- colors.secondary.secondary_container
+ colors.secondary.container
} else if name.contains("function") {
- colors.primary.primary_container
+ colors.primary.container
} else {
// Default fallback for unknown custom scopes
- colors.surface.on_surface_variant
+ colors.surface.text_variant
}
}
};
diff --git a/src/panes/style.rs b/src/panes/style.rs
index df21a04..f2e3251 100644
--- a/src/panes/style.rs
+++ b/src/panes/style.rs
@@ -6,8 +6,8 @@ pub fn title_bar(theme: &Theme) -> Style {
let surface = theme.colors().surface;
Style {
- text_color: Some(surface.on_surface),
- background: Some(Background::Color(surface.surface_container.high)),
+ text_color: Some(surface.text),
+ background: Some(Background::Color(surface.container.high)),
..Default::default()
}
}
@@ -16,10 +16,10 @@ pub fn pane_active(theme: &Theme) -> Style {
let surface = theme.colors().surface;
Style {
- background: Some(Background::Color(surface.surface_container.low)),
+ background: Some(Background::Color(surface.container.low)),
border: Border {
width: 1.0,
- color: surface.surface_container.high,
+ color: surface.container.high,
..Border::default()
},
..Default::default()
@@ -30,10 +30,10 @@ pub fn pane_focused(theme: &Theme) -> Style {
let surface = theme.colors().surface;
Style {
- background: Some(Background::Color(surface.surface_container.low)),
+ background: Some(Background::Color(surface.container.low)),
border: Border {
width: 2.0,
- color: surface.surface_container.high,
+ color: surface.container.high,
..Border::default()
},
..Default::default()
diff --git a/src/widget/button.rs b/src/widget/button.rs
index 5a1975b..e255808 100644
--- a/src/widget/button.rs
+++ b/src/widget/button.rs
@@ -3,11 +3,11 @@ use iced_material::Theme;
use iced_material::button::styled;
pub fn danger(theme: &Theme, status: Status) -> Style {
- let primary = theme.colors().error;
+ let error = theme.colors().error;
- let foreground = primary.on_error;
- let background = primary.color;
- let disabled = theme.colors().surface.on_surface;
+ let foreground = error.text;
+ let background = error.color;
+ let disabled = theme.colors().surface.text;
let shadow_color = theme.colors().shadow;