refactor: graphics applet popover and icon button
This commit is contained in:
parent
06d9584a31
commit
d6b7b9fcd1
2 changed files with 36 additions and 4 deletions
|
|
@ -11,3 +11,4 @@ once_cell = "1.9.0"
|
||||||
relm4-macros = "0.4.2"
|
relm4-macros = "0.4.2"
|
||||||
tokio = { version = "1.16.1", features = ["full"] }
|
tokio = { version = "1.16.1", features = ["full"] }
|
||||||
zbus = "2.1.1"
|
zbus = "2.1.1"
|
||||||
|
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", features = ["gtk4"]}
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ use gtk4::{
|
||||||
};
|
};
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
use tokio::runtime::Runtime;
|
use tokio::runtime::Runtime;
|
||||||
|
use cosmic_panel_config::config::CosmicPanelConfig;
|
||||||
|
|
||||||
static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime"));
|
static RT: Lazy<Runtime> = Lazy::new(|| Runtime::new().expect("failed to build tokio runtime"));
|
||||||
|
|
||||||
|
|
@ -64,13 +65,39 @@ fn build_ui(application: >k4::Application) {
|
||||||
let window = gtk4::ApplicationWindow::builder()
|
let window = gtk4::ApplicationWindow::builder()
|
||||||
.application(application)
|
.application(application)
|
||||||
.title("COSMIC Graphics Applet")
|
.title("COSMIC Graphics Applet")
|
||||||
.default_width(400)
|
.default_width(1)
|
||||||
.default_height(300)
|
.default_height(1)
|
||||||
|
.decorated(false)
|
||||||
.build();
|
.build();
|
||||||
let current_graphics = RT
|
let config = CosmicPanelConfig::load_from_env().unwrap_or_default();
|
||||||
|
let popover = gtk4::builders::PopoverBuilder::new()
|
||||||
|
.autohide(true)
|
||||||
|
.has_arrow(false)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
let button = gtk4::Button::new();
|
||||||
|
button.add_css_class("panel_icon");
|
||||||
|
button.connect_clicked(glib::clone!(@weak popover => move |_| {
|
||||||
|
popover.show();
|
||||||
|
}));
|
||||||
|
|
||||||
|
// TODO cleanup
|
||||||
|
let image = gtk4::Image::from_icon_name("input-gaming");
|
||||||
|
image.add_css_class("panel_icon");
|
||||||
|
image.set_pixel_size(config.get_applet_icon_size().try_into().unwrap());
|
||||||
|
button.set_child(Some(&image));
|
||||||
|
let current_graphics = RT
|
||||||
.block_on(get_current_graphics())
|
.block_on(get_current_graphics())
|
||||||
.expect("failed to connect to system76-power");
|
.expect("failed to connect to system76-power");
|
||||||
|
view! {
|
||||||
|
icon_box = gtk4::Box {
|
||||||
|
set_orientation: Orientation::Vertical,
|
||||||
|
set_spacing: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let (tx, rx) = MainContext::channel::<bool>(PRIORITY_DEFAULT);
|
let (tx, rx) = MainContext::channel::<bool>(PRIORITY_DEFAULT);
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
main_overlay = Overlay {
|
main_overlay = Overlay {
|
||||||
add_overlay: loading_box = >k4::Box {
|
add_overlay: loading_box = >k4::Box {
|
||||||
|
|
@ -174,7 +201,11 @@ fn build_ui(application: >k4::Application) {
|
||||||
Continue(true)
|
Continue(true)
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
window.set_child(Some(&main_overlay));
|
popover.set_child(Some(&main_overlay));
|
||||||
|
|
||||||
|
icon_box.append(&button);
|
||||||
|
icon_box.append(&popover);
|
||||||
|
window.set_child(Some(&icon_box));
|
||||||
|
|
||||||
window.show();
|
window.show();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue