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

Pass app to PanelWindow::new()

Browse source
This commit is contained in:
Ian Douglas Scott 2021-09-07 12:56:25 -07:00
parent 4e5479cdd8
commit 7430b965e1
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/application.rs
View file

@ -81,9 +81,9 @@ impl PanelApp {
} }
fn add_window_for_monitor(&self, monitor: gdk::Monitor) { fn add_window_for_monitor(&self, monitor: gdk::Monitor) {
self.add_window(&cascade! { cascade! {
PanelWindow::new(monitor); PanelWindow::new(self, monitor);
..show(); ..show();
}); };
} }
} }

5
src/window.rs
View file

@ -3,6 +3,7 @@ use glib::clone;
use gtk4::{gdk, glib, pango, prelude::*, subclass::prelude::*}; use gtk4::{gdk, glib, pango, prelude::*, subclass::prelude::*};
use std::cell::Cell; use std::cell::Cell;
use crate::application::PanelApp;
use crate::deref_cell::DerefCell; use crate::deref_cell::DerefCell;
use crate::status_area::StatusArea; use crate::status_area::StatusArea;
use crate::time_button::TimeButton; use crate::time_button::TimeButton;
@ -121,7 +122,7 @@ glib::wrapper! {
} }
impl PanelWindow { impl PanelWindow {
pub fn new(monitor: gdk::Monitor) -> Self { pub fn new(app: &PanelApp, monitor: gdk::Monitor) -> Self {
let obj = glib::Object::new::<Self>(&[]).unwrap(); let obj = glib::Object::new::<Self>(&[]).unwrap();
monitor.connect_invalidate(clone!(@weak obj => move |_| obj.close())); monitor.connect_invalidate(clone!(@weak obj => move |_| obj.close()));
@ -129,6 +130,8 @@ impl PanelWindow {
obj.set_size_request(monitor.geometry().width, 0); obj.set_size_request(monitor.geometry().width, 0);
obj.inner().monitor.set(monitor); obj.inner().monitor.set(monitor);
app.add_window(&obj);
obj obj
} }