leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update libcosmic and adjust dialog size

Browse source
This commit is contained in:
Jeremy Soller 2024-03-01 09:18:57 -07:00
parent 9cc1a0f16d
commit 0b8ca753b8
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
4 changed files with 10 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Cargo.lock generated
View file

@ -1127,7 +1127,6 @@ dependencies = [
[[package]]
name = "cosmic-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"atomicwrites",
"cosmic-config-derive",
@ -1144,7 +1143,6 @@ dependencies = [
[[package]]
name = "cosmic-config-derive"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"quote",
"syn 1.0.109",
@ -1206,7 +1204,6 @@ dependencies = [
[[package]]
name = "cosmic-theme"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"almost",
"cosmic-config",
@ -2597,7 +2594,6 @@ dependencies = [
[[package]]
name = "iced"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"iced_accessibility",
"iced_core",
@ -2612,7 +2608,6 @@ dependencies = [
[[package]]
name = "iced_accessibility"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"accesskit",
"accesskit_winit",
@ -2621,7 +2616,6 @@ dependencies = [
[[package]]
name = "iced_core"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"bitflags 1.3.2",
"log",
@ -2638,7 +2632,6 @@ dependencies = [
[[package]]
name = "iced_futures"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"futures",
"iced_core",
@ -2651,7 +2644,6 @@ dependencies = [
[[package]]
name = "iced_graphics"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"bitflags 1.3.2",
"bytemuck",
@ -2675,7 +2667,6 @@ dependencies = [
[[package]]
name = "iced_renderer"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@ -2687,7 +2678,6 @@ dependencies = [
[[package]]
name = "iced_runtime"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"iced_core",
"iced_futures",
@ -2697,7 +2687,6 @@ dependencies = [
[[package]]
name = "iced_style"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"iced_core",
"once_cell",
@ -2707,7 +2696,6 @@ dependencies = [
[[package]]
name = "iced_tiny_skia"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"bytemuck",
"cosmic-text",
@ -2724,7 +2712,6 @@ dependencies = [
[[package]]
name = "iced_wgpu"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"bitflags 1.3.2",
"bytemuck",
@ -2743,7 +2730,6 @@ dependencies = [
[[package]]
name = "iced_widget"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"iced_renderer",
"iced_runtime",
@ -2757,7 +2743,6 @@ dependencies = [
[[package]]
name = "iced_winit"
version = "0.12.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"iced_graphics",
"iced_runtime",
@ -3101,7 +3086,6 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "libcosmic"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#e12d6253389860dc9fbb0d651e86287ad8f609ae"
dependencies = [
"apply",
"ashpd",
@ -3881,9 +3865,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "open"
version = "5.0.2"
version = "5.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eedff767bc49d336bff300224f73307ae36963c843e38dc9312a22171b012cbc"
checksum = "1f2588edf622de56e7a1fed57bf203344f63c03f3d43472ba0434a92373c8f27"
dependencies = [
"is-wsl",
"libc",

3
Cargo.toml
View file

@ -33,7 +33,8 @@ i18n-embed-fl = "0.7"
rust-embed = "8"
[dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic.git"
#git = "https://github.com/pop-os/libcosmic.git"
path = "../libcosmic"
default-features = false
features = ["multi-window", "tokio", "winit"]

16
src/app.rs
View file

@ -294,14 +294,10 @@ impl App {
}
fn update_title(&mut self) -> Command<Message> {
let (header_title, window_title) = match self.tab_model.text(self.tab_model.active()) {
Some(tab_title) => (
tab_title.to_string(),
format!("{tab_title} — COSMIC File Manager"),
),
None => (String::new(), "COSMIC File Manager".to_string()),
let window_title = match self.tab_model.text(self.tab_model.active()) {
Some(tab_title) => format!("{tab_title} — {}", fl!("cosmic-files")),
None => fl!("cosmic-files"),
};
self.set_header_title(header_title);
self.set_window_title(window_title, window::Id::MAIN)
}
@ -480,8 +476,7 @@ impl App {
..tab_config
})
})
.step(25u16)
.width(Length::Fixed(100.0)),
.step(25u16),
)
})
.add({
@ -499,8 +494,7 @@ impl App {
..tab_config
})
})
.step(25u16)
.width(Length::Fixed(100.0)),
.step(25u16),
)
})
.into(),

2
src/dialog.rs
View file

@ -96,7 +96,7 @@ impl<M: Send + 'static> Dialog<M> {
settings.transparent = true;
//TODO: allow resize!
settings.size = Size::new(800.0, 600.0);
settings.size = Size::new(1024.0, 640.0);
settings.resizable = false;
#[cfg(target_os = "linux")]