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

Update libcosmic jammy (#128)

Browse source 
* update libcosmic

* fix checkmarks for graphics applet

* chore: update

* update iced

* chore: udpate libcosmic
This commit is contained in:
Ashley Wulber 2023-10-18 13:23:13 -04:00 • committed by GitHub
parent 9d321822a9
commit 282e4911c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 410 additions and 437 deletions
Download patch file Download diff file Expand all files Collapse all files

757
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

7
Cargo.toml
View file

@ -39,9 +39,8 @@ lto = "thin"
# [patch."https://github.com/pop-os/cosmic-time"]
# cosmic-time = { path = "../cosmic-time" }
# [patch."https://github.com/pop-os/libcosmic"]
# libcosmic = { path = "../libcosmic" }
# [patch."https://github.com/pop-os/cosmic-config"]
# cosmic-config = { path = "../libcosmic/cosmic-config" }
[patch."https://github.com/pop-os/libcosmic"]
libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
[patch."https://github.com/Smithay/client-toolkit"]
sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "dc8c4a0" }

83
cosmic-applet-graphics/src/window.rs
View file

@ -7,7 +7,8 @@ use cosmic::iced_runtime::core::alignment::Horizontal;
use cosmic::iced_runtime::core::Alignment;
use cosmic::iced_style::application;
use cosmic::theme::Button;
use cosmic::widget::{icon, Icon};
use cosmic::widget::divider::horizontal;
use cosmic::widget::{horizontal_space, icon, Container, Icon};
use cosmic::{
applet::{button_theme, cosmic_panel_config::PanelAnchor},
Command,
@ -261,15 +262,6 @@ impl cosmic::Application for Window {
}
fn view_window(&self, _id: window::Id) -> Element<Message> {
let symbolic = matches!(
self.graphics_mode,
Some(GraphicsMode::CurrentGraphicsMode(Graphics::Integrated))
| Some(GraphicsMode::AppliedGraphicsMode(Graphics::Integrated))
| Some(GraphicsMode::SelectedGraphicsMode {
new: Graphics::Integrated,
..
})
);
let content_list = vec![
button(
row![
@ -278,16 +270,7 @@ impl cosmic::Application for Window {
text(fl!("integrated-desc")).size(12)
]
.width(Length::Fill),
icon::from_name(match self.graphics_mode {
Some(GraphicsMode::SelectedGraphicsMode {
new: Graphics::Integrated,
..
}) => "process-working-symbolic",
_ => "emblem-ok-symbolic",
})
.size(12)
.symbolic(symbolic)
.prefer_svg(!symbolic)
button_icon(self.graphics_mode, Graphics::Integrated)
]
.align_items(Alignment::Center),
)
@ -300,16 +283,7 @@ impl cosmic::Application for Window {
row![
column![text(format!("{} {}", fl!("nvidia"), fl!("graphics"))).size(14)]
.width(Length::Fill),
icon::from_name(match self.graphics_mode {
Some(GraphicsMode::SelectedGraphicsMode {
new: Graphics::Nvidia,
..
}) => "process-working-symbolic",
_ => "emblem-ok-symbolic",
},)
.size(12)
.symbolic(symbolic)
.prefer_svg(!symbolic),
button_icon(self.graphics_mode, Graphics::Nvidia)
]
.align_items(Alignment::Center),
)
@ -325,16 +299,7 @@ impl cosmic::Application for Window {
text(fl!("hybrid-desc")).size(12)
]
.width(Length::Fill),
icon::from_name(match self.graphics_mode {
Some(GraphicsMode::SelectedGraphicsMode {
new: Graphics::Hybrid,
..
}) => "process-working-symbolic",
_ => "emblem-ok-symbolic",
},)
.size(12)
.symbolic(symbolic)
.prefer_svg(!symbolic),
button_icon(self.graphics_mode, Graphics::Hybrid)
]
.align_items(Alignment::Center),
)
@ -350,16 +315,7 @@ impl cosmic::Application for Window {
text(fl!("compute-desc")).size(12)
]
.width(Length::Fill),
icon::from_name(match self.graphics_mode {
Some(GraphicsMode::SelectedGraphicsMode {
new: Graphics::Compute,
..
}) => "process-working-symbolic",
_ => "emblem-ok-symbolic",
},)
.size(12)
.symbolic(symbolic)
.prefer_svg(!symbolic)
button_icon(self.graphics_mode, Graphics::Compute)
]
.align_items(Alignment::Center),
)
@ -399,3 +355,30 @@ impl cosmic::Application for Window {
Some(Message::PopupClosed(id))
}
}
fn button_icon<'a>(
cur_mode: Option<GraphicsMode>,
button_mode: Graphics,
) -> Container<'a, Message, cosmic::Renderer> {
match cur_mode {
Some(GraphicsMode::SelectedGraphicsMode { prev: _, new }) if new == button_mode => {
cosmic::widget::container(
icon::from_name("process-working-symbolic")
.size(12)
.symbolic(true)
.prefer_svg(true),
)
}
Some(GraphicsMode::AppliedGraphicsMode(g) | GraphicsMode::CurrentGraphicsMode(g))
if g == button_mode =>
{
cosmic::widget::container(
icon::from_name("emblem-ok-symbolic")
.size(12)
.symbolic(true)
.prefer_svg(true),
)
}
_ => cosmic::widget::container(horizontal_space(1.0)),
}
}