Skip to content

Commit

Permalink
chore: update rust-version and dependencies (#3)
Browse files Browse the repository at this point in the history
* chore: update rust-version to 1.75

* chore: update upstream
  • Loading branch information
golota60 authored Jan 8, 2024
1 parent 06b848a commit e365778
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Next, add `oxytail-base`(to load a theme) and `oxytail-theme-dark`(a theme) also
```toml
[dependencies]

floem = { git = "https://github.com/lapce/floem", rev = "92ba6406b2406e4223933267137229db0a619a0a" }
floem = { git = "https://github.com/lapce/floem", rev = "e304d30f8771a28788904d64464d8fd192d07439" }
oxytail-theme-dark = { git = "https://github.com/golota60/oxytail"}
oxytail-base = { git = "https://github.com/golota60/oxytail"}
```
Expand Down Expand Up @@ -78,7 +78,7 @@ fn main() {
})
// 1. We don't want any default `floem` styling to be interfering with ours,
// so we need to disable the default styling.
.themed(false);
.apply_default_theme(false);

// 2. We need to initialize our theme
init_theme(Theme::Dark);
Expand Down
4 changes: 2 additions & 2 deletions examples/widget-gallery/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
name = "widget-gallery"
version = "0.1.0"
edition = "2021"
rust-version = "1.74.1"
rust-version = "1.75"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
oxytail-theme-dark = { path = "../../oxytail-theme-dark" }
oxytail-base = { path = "../../oxytail-base" }
floem = { git = "https://github.com/lapce/floem", rev = "92ba6406b2406e4223933267137229db0a619a0a" }
floem = { git = "https://github.com/lapce/floem", rev = "e304d30f8771a28788904d64464d8fd192d07439" }
2 changes: 1 addition & 1 deletion examples/widget-gallery/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ fn main() {
width: 1200.0,
height: 800.0,
})
.themed(false);
.apply_default_theme(false);

init_theme(Theme::Dark);
let root_view = app_view();
Expand Down
4 changes: 2 additions & 2 deletions oxytail-base/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ description = "Building block for creating oxytail themes"
license = "MIT"
version = "0.1.0"
edition = "2021"
rust-version = "1.74.1"
rust-version = "1.75"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
floem = { git = "https://github.com/lapce/floem", rev = "92ba6406b2406e4223933267137229db0a619a0a" }
floem = { git = "https://github.com/lapce/floem", rev = "e304d30f8771a28788904d64464d8fd192d07439" }

2 changes: 1 addition & 1 deletion oxytail-base/src/widgets/checkbox.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ pub fn labeled_checkbox<S: Display + 'static>(
props: Option<CheckboxProps>,
) -> impl View {
h_stack((checkbox_svg(checked, props), views::label(label)))
.base_style(|s| s.items_center().justify_center())
.style(|s| s.items_center().justify_center())
.keyboard_navigatable()
}
2 changes: 1 addition & 1 deletion oxytail-base/src/widgets/text_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub fn text_input(buffer: RwSignal<String>, props: Option<InputProps>) -> TextIn
let styles_enhancer = theme.get_input_style(props);

// .style() does not exist on an input
let styled_input = base_widget.base_style(move |s| styles_enhancer(s));
let styled_input = base_widget.style(move |s| styles_enhancer(s));

styled_input
}
4 changes: 2 additions & 2 deletions oxytail-theme-dark/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ description = "Dark theme for oxytail-base"
license = "MIT"
version = "0.1.0"
edition = "2021"
rust-version = "1.74.1"
rust-version = "1.75"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
floem = { git = "https://github.com/lapce/floem", rev = "e304d30f8771a28788904d64464d8fd192d07439" }
oxytail-base = { path = "../oxytail-base"}
floem = { git = "https://github.com/lapce/floem", rev = "92ba6406b2406e4223933267137229db0a619a0a" }

0 comments on commit e365778

Please sign in to comment.