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

cleanup

Browse source
This commit is contained in:
Ashley Wulber 2022-06-20 16:15:19 -04:00
parent b5b79e596f
commit 8e9d7a1e91
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -428,7 +428,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-panel-config" name = "cosmic-panel-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel/#231dc1ec0656840458d9f0d3468d9c7ea5c2a98c" source = "git+https://github.com/pop-os/cosmic-panel#231dc1ec0656840458d9f0d3468d9c7ea5c2a98c"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"gtk4", "gtk4",

12
applets/cosmic-applet-workspaces/src/wayland.rs
View file

@ -5,7 +5,10 @@ use crate::{
}; };
use cosmic_panel_config::config::CosmicPanelConfig; use cosmic_panel_config::config::CosmicPanelConfig;
use gtk4::glib; use gtk4::glib;
use std::{env, mem, os::unix::net::UnixStream, path::PathBuf, sync::Arc, time::Duration, collections::HashMap, hash::Hash}; use std::{
collections::HashMap, env, hash::Hash, mem, os::unix::net::UnixStream, path::PathBuf,
sync::Arc, time::Duration,
};
use tokio::sync::mpsc; use tokio::sync::mpsc;
use wayland_backend::client::ObjectData; use wayland_backend::client::ObjectData;
use wayland_client::{ use wayland_client::{
@ -47,8 +50,6 @@ use self::generated::client::{
zext_workspace_handle_v1::{self, ZextWorkspaceHandleV1}, zext_workspace_handle_v1::{self, ZextWorkspaceHandleV1},
}; };
// TODO check panel config to find which output we are on and ignore outputs which are different
pub fn spawn_workspaces(tx: glib::Sender<State>) -> mpsc::Sender<WorkspaceEvent> { pub fn spawn_workspaces(tx: glib::Sender<State>) -> mpsc::Sender<WorkspaceEvent> {
let (workspaces_tx, mut workspaces_rx) = mpsc::channel(100); let (workspaces_tx, mut workspaces_rx) = mpsc::channel(100);
@ -65,7 +66,9 @@ pub fn spawn_workspaces(tx: glib::Sender<State>) -> mpsc::Sender<WorkspaceEvent>
.and_then(|s| s.map(|s| Connection::from_socket(s).map_err(anyhow::Error::msg))) .and_then(|s| s.map(|s| Connection::from_socket(s).map_err(anyhow::Error::msg)))
{ {
std::thread::spawn(move || { std::thread::spawn(move || {
let output = CosmicPanelConfig::load_from_env().unwrap_or_default().output; let output = CosmicPanelConfig::load_from_env()
.unwrap_or_default()
.output;
let mut event_loop = calloop::EventLoop::<State>::try_new().unwrap(); let mut event_loop = calloop::EventLoop::<State>::try_new().unwrap();
let loop_handle = event_loop.handle(); let loop_handle = event_loop.handle();
let event_queue = conn.new_event_queue::<State>(); let event_queue = conn.new_event_queue::<State>();
@ -275,7 +278,6 @@ impl Dispatch<ZextWorkspaceGroupHandleV1, ()> for State {
) { ) {
match event { match event {
zext_workspace_group_handle_v1::Event::OutputEnter { output } => { zext_workspace_group_handle_v1::Event::OutputEnter { output } => {
if let Some(group) = self if let Some(group) = self
.workspace_groups .workspace_groups
.iter_mut() .iter_mut()