Run cargo update, and remove use of WorkspaceAmount
`WorkspaceAmount` has been removed from cosmic-comp for now.
This commit is contained in:
Ian Douglas Scott
parent
59717b80ea
commit
66fcf19ccc
3 changed files with 58 additions and 50 deletions
65
Cargo.lock
generated
65
Cargo.lock
generated
|
|
@ -554,9 +554,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
|
|||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.14.1"
|
||||
version = "1.14.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9"
|
||||
checksum = "ea31d69bda4949c1c1562c1e6f042a1caefac98cdc8a298260a2ff41c1e2d42b"
|
||||
dependencies = [
|
||||
"bytemuck_derive",
|
||||
]
|
||||
|
|
@ -863,7 +863,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cosmic-comp-config"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/cosmic-comp#ec822e421f8e804d5e18a7dc516fde8c3347797a"
|
||||
source = "git+https://github.com/pop-os/cosmic-comp#e43c0f648df04395fb804cd98aeccb4ef656e431"
|
||||
dependencies = [
|
||||
"cosmic-config",
|
||||
"input",
|
||||
|
|
@ -873,7 +873,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cosmic-config"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"atomicwrites",
|
||||
"cosmic-config-derive",
|
||||
|
|
@ -890,7 +890,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cosmic-config-derive"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
|
|
@ -911,8 +911,8 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "cosmic-text"
|
||||
version = "0.10.0"
|
||||
source = "git+https://github.com/pop-os/cosmic-text.git?rev=1b025ae#1b025ae56e0122cff5798b9f54fc56d47a182d2b"
|
||||
version = "0.11.0"
|
||||
source = "git+https://github.com/pop-os/cosmic-text.git#990d66ed41df4fae5db23ec10c9d6c0e95854449"
|
||||
dependencies = [
|
||||
"bitflags 2.4.2",
|
||||
"fontdb",
|
||||
|
|
@ -934,7 +934,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cosmic-theme"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"almost",
|
||||
"cosmic-config",
|
||||
|
|
@ -2001,7 +2001,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "glyphon"
|
||||
version = "0.5.0"
|
||||
source = "git+https://github.com/pop-os/glyphon.git?tag=cosmic-0.5-wgpu#db9620f48ceef47e214f3a058b9504e9983ed987"
|
||||
source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8"
|
||||
dependencies = [
|
||||
"cosmic-text",
|
||||
"etagere",
|
||||
|
|
@ -2244,7 +2244,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"iced_accessibility",
|
||||
"iced_core",
|
||||
|
|
@ -2259,7 +2259,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_accessibility"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"accesskit",
|
||||
"accesskit_unix",
|
||||
|
|
@ -2268,7 +2268,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_core"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"iced_accessibility",
|
||||
|
|
@ -2287,7 +2287,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_futures"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"iced_core",
|
||||
|
|
@ -2300,7 +2300,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_graphics"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"bytemuck",
|
||||
|
|
@ -2324,7 +2324,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_renderer"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"iced_graphics",
|
||||
"iced_tiny_skia",
|
||||
|
|
@ -2336,7 +2336,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_runtime"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"iced_accessibility",
|
||||
"iced_core",
|
||||
|
|
@ -2348,7 +2348,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_sctk"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"enum-repr",
|
||||
"float-cmp",
|
||||
|
|
@ -2374,7 +2374,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_style"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"iced_core",
|
||||
"once_cell",
|
||||
|
|
@ -2384,7 +2384,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_tiny_skia"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"cosmic-text",
|
||||
|
|
@ -2401,7 +2401,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_wgpu"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"bytemuck",
|
||||
|
|
@ -2420,7 +2420,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "iced_widget"
|
||||
version = "0.12.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"iced_renderer",
|
||||
"iced_runtime",
|
||||
|
|
@ -2679,7 +2679,7 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
|||
[[package]]
|
||||
name = "libcosmic"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/libcosmic#6ebda94c79a7d349bf5e5eba944d399ac1215106"
|
||||
source = "git+https://github.com/pop-os/libcosmic#68dc09cd6ce86cb7b199ee014e6ccd9bef0ccb10"
|
||||
dependencies = [
|
||||
"apply",
|
||||
"ashpd",
|
||||
|
|
@ -3071,28 +3071,27 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "num-complex"
|
||||
version = "0.4.4"
|
||||
version = "0.4.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
|
||||
checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
|
||||
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-iter"
|
||||
version = "0.1.43"
|
||||
version = "0.1.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
|
||||
checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"num-integer",
|
||||
|
|
@ -3113,9 +3112,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.17"
|
||||
version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
|
||||
checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"libm",
|
||||
|
|
@ -4616,9 +4615,9 @@ checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
|
|||
|
||||
[[package]]
|
||||
name = "unicode-segmentation"
|
||||
version = "1.10.1"
|
||||
version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
|
||||
checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-vo"
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ use cosmic::{
|
|||
},
|
||||
iced_sctk::commands::layer_surface::{destroy_layer_surface, get_layer_surface},
|
||||
};
|
||||
use cosmic_comp_config::{workspace::WorkspaceAmount, CosmicCompConfig};
|
||||
use cosmic_comp_config::CosmicCompConfig;
|
||||
use cosmic_config::ConfigSet;
|
||||
use cosmic_config::{cosmic_config_derive::CosmicConfigEntry, CosmicConfigEntry};
|
||||
use i18n_embed::DesktopLanguageRequester;
|
||||
|
|
@ -509,6 +509,7 @@ impl Application for App {
|
|||
}
|
||||
Msg::CloseWorkspace(_workspace_handle) => {
|
||||
// XXX close specific workspace
|
||||
/*
|
||||
if let WorkspaceAmount::Static(n) = &mut self.conf.workspace_config.workspace_amount
|
||||
{
|
||||
if *n != 1 {
|
||||
|
|
@ -518,6 +519,7 @@ impl Application for App {
|
|||
.set("workspaces", &self.conf.workspace_config);
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
Msg::CloseToplevel(toplevel_handle) => {
|
||||
// TODO confirmation?
|
||||
|
|
@ -597,6 +599,7 @@ impl Application for App {
|
|||
}
|
||||
}
|
||||
Msg::NewWorkspace => {
|
||||
/*
|
||||
if let WorkspaceAmount::Static(n) = &mut self.conf.workspace_config.workspace_amount
|
||||
{
|
||||
*n += 1;
|
||||
|
|
@ -604,6 +607,7 @@ impl Application for App {
|
|||
.cosmic_comp_config
|
||||
.set("workspaces", &self.conf.workspace_config);
|
||||
}
|
||||
*/
|
||||
}
|
||||
Msg::Config(c) => {
|
||||
self.conf.config = c;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ use cosmic::{
|
|||
iced_core::Shadow,
|
||||
widget,
|
||||
};
|
||||
use cosmic_comp_config::workspace::{WorkspaceAmount, WorkspaceLayout};
|
||||
use cosmic_comp_config::workspace::WorkspaceLayout;
|
||||
|
||||
use crate::{wayland::CaptureImage, App, DragSurface, LayerSurface, Msg, Toplevel, Workspace};
|
||||
|
||||
|
|
@ -37,7 +37,6 @@ pub(crate) fn layer_surface<'a>(
|
|||
.filter(|i| i.outputs.contains(&surface.output)),
|
||||
&surface.output,
|
||||
layout,
|
||||
app.conf.workspace_config.workspace_amount,
|
||||
drop_target,
|
||||
);
|
||||
let toplevels = toplevel_previews(
|
||||
|
|
@ -144,7 +143,6 @@ fn workspaces_sidebar<'a>(
|
|||
workspaces: impl Iterator<Item = &'a Workspace>,
|
||||
output: &'a wl_output::WlOutput,
|
||||
layout: WorkspaceLayout,
|
||||
amount: WorkspaceAmount,
|
||||
drop_target: Option<&zcosmic_workspace_handle_v1::ZcosmicWorkspaceHandleV1>,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
let sidebar_entries = workspaces
|
||||
|
|
@ -166,6 +164,7 @@ fn workspaces_sidebar<'a>(
|
|||
)
|
||||
.on_press(Msg::NewWorkspace)
|
||||
.width(iced::Length::Fill);
|
||||
/*
|
||||
let bar: cosmic::Element<_> = if amount != WorkspaceAmount::Dynamic {
|
||||
match layout {
|
||||
WorkspaceLayout::Vertical => {
|
||||
|
|
@ -178,24 +177,30 @@ fn workspaces_sidebar<'a>(
|
|||
} else {
|
||||
sidebar_entries_container.into()
|
||||
};
|
||||
*/
|
||||
// Shrink?
|
||||
let (width, height) = match layout {
|
||||
WorkspaceLayout::Vertical => (iced::Length::Fill, iced::Length::Shrink),
|
||||
WorkspaceLayout::Horizontal => (iced::Length::Shrink, iced::Length::Fill),
|
||||
};
|
||||
widget::container(widget::container(bar).width(width).height(height).style(
|
||||
cosmic::theme::Container::custom(|theme| cosmic::iced_style::container::Appearance {
|
||||
text_color: Some(theme.cosmic().on_bg_color().into()),
|
||||
icon_color: Some(theme.cosmic().on_bg_color().into()),
|
||||
background: Some(iced::Color::from(theme.cosmic().background.base).into()),
|
||||
border: Border {
|
||||
radius: (12.0).into(),
|
||||
width: 0.0,
|
||||
color: iced::Color::TRANSPARENT,
|
||||
},
|
||||
shadow: Shadow::default(),
|
||||
}),
|
||||
))
|
||||
widget::container(
|
||||
widget::container(sidebar_entries_container)
|
||||
.width(width)
|
||||
.height(height)
|
||||
.style(cosmic::theme::Container::custom(|theme| {
|
||||
cosmic::iced_style::container::Appearance {
|
||||
text_color: Some(theme.cosmic().on_bg_color().into()),
|
||||
icon_color: Some(theme.cosmic().on_bg_color().into()),
|
||||
background: Some(iced::Color::from(theme.cosmic().background.base).into()),
|
||||
border: Border {
|
||||
radius: (12.0).into(),
|
||||
width: 0.0,
|
||||
color: iced::Color::TRANSPARENT,
|
||||
},
|
||||
shadow: Shadow::default(),
|
||||
}
|
||||
})),
|
||||
)
|
||||
.width(width)
|
||||
.height(height)
|
||||
.padding(24.0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue