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

feat: config changes

Browse source
This commit is contained in:
Ashley Wulber 2022-07-27 00:37:00 -04:00
parent e24ef3fbbd
commit e87d101217
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
12 changed files with 129 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

16
applets/cosmic-app-list/src/apps_container/mod.rs
View file

@ -29,9 +29,7 @@ impl AppsContainer {
// ..add_css_class("dock_container");
};
let config = CosmicPanelConfig::load_from_env().unwrap_or_default();
let saved_app_list_view = DockList::new(DockListType::Saved, config.clone());
let saved_app_list_view = DockList::new(DockListType::Saved);
self_.append(&saved_app_list_view);
let separator_container = cascade! {
@ -49,21 +47,15 @@ impl AppsContainer {
..add_css_class("dock_separator");
};
separator_container.append(&separator);
let active_app_list_view = DockList::new(DockListType::Active, config.clone());
let active_app_list_view = DockList::new(DockListType::Active);
self_.append(&active_app_list_view);
// self_.connect_orientation_notify(glib::clone!(@weak separator => move |c| {
// dbg!(c.orientation());
// separator.set_orientation(match c.orientation() {
// Orientation::Horizontal => Orientation::Vertical,
// _ => Orientation::Horizontal,
// });
// }));
imp.saved_list.set(saved_app_list_view).unwrap();
imp.active_list.set(active_app_list_view).unwrap();
// Setup
self_.setup_callbacks();
self_.set_position(config.anchor);
let anchor = std::env::var("COSMIC_PANEL_ANCHOR").ok().and_then(|anchor| anchor.parse::<PanelAnchor>().ok()).unwrap_or_default();
self_.set_position(anchor);
Self::setup_callbacks(&self_);

16
applets/cosmic-app-list/src/dock_list/mod.rs
View file

@ -8,7 +8,7 @@ use crate::{
{TX, WAYLAND_TX},
};
use cascade::cascade;
use cosmic_panel_config::{CosmicPanelConfig, PanelAnchor};
use cosmic_panel_config::{CosmicPanelConfig, PanelAnchor, PanelSize};
use gio::traits::AppLaunchContextExt;
use gtk4::{
@ -44,11 +44,10 @@ impl Default for DockListType {
}
impl DockList {
pub fn new(type_: DockListType, config: CosmicPanelConfig) -> Self {
pub fn new(type_: DockListType) -> Self {
let self_: DockList = glib::Object::new(&[]).expect("Failed to create DockList");
let imp = imp::DockList::from_instance(&self_);
imp.type_.set(type_).unwrap();
imp.config.set(config).unwrap();
self_.layout();
//dnd behavior is different for each type, as well as the data in the model
self_.setup_model();
@ -500,7 +499,16 @@ impl DockList {
let popover_menu_index = &imp.popover_menu_index;
let factory = SignalListItemFactory::new();
let model = imp.model.get().expect("Failed to get saved app model.");
let icon_size = imp.config.get().unwrap().get_applet_icon_size();
let icon_size = std::env::var("COSMIC_PANEL_SIZE").ok().and_then(|size| match size.parse::<PanelSize>() {
Ok(PanelSize::XL) => Some(64),
Ok(PanelSize::L) => Some(48),
Ok(PanelSize::M) => Some(36),
Ok(PanelSize::S) => Some(24),
Ok(PanelSize::XS) => Some(18),
Err(_) => Some(36),
}).unwrap_or(36);
factory.connect_setup(
glib::clone!(@weak popover_menu_index, @weak model => move |_, list_item| {
let dock_item = DockItem::new(icon_size);

3
applets/cosmic-app-list/src/dock_popover/mod.rs
View file

@ -6,7 +6,7 @@ use gtk4::gdk::pango::EllipsizeMode;
use gtk4::subclass::prelude::*;
use gtk4::{gdk, gio, glib};
use gtk4::{prelude::*, Label};
use gtk4::{Box, Button, Image, ListBox, Orientation};
use gtk4::{Box, Button, ListBox, Orientation};
use crate::dock_object::DockObject;
use crate::utils::AppListEvent;
@ -25,7 +25,6 @@ glib::wrapper! {
impl DockPopover {
pub fn new() -> Self {
let self_: DockPopover = glib::Object::new(&[]).expect("Failed to create DockList");
let imp = imp::DockPopover::from_instance(&self_);
self_.layout();
//dnd behavior is different for each type, as well as the data in the model
self_

2
applets/cosmic-app-list/src/main.rs
View file

@ -9,7 +9,7 @@ use gtk4::gdk::Display;
use gtk4::{glib, prelude::*, CssProvider, StyleContext};
use once_cell::sync::OnceCell;
use std::collections::BTreeMap;
use utils::{block_on, AppListEvent, BoxedWindowList, DEST, PATH};
use utils::{AppListEvent, BoxedWindowList};
use wayland::{Toplevel, ToplevelEvent};
mod apps_container;

12
applets/cosmic-app-list/src/wayland.rs
View file

@ -1,7 +1,7 @@
use crate::config::AppListConfig;
use crate::{config::TopLevelFilter, utils::AppListEvent, wayland_source::WaylandSource, TX};
use calloop::channel::*;
use cosmic_panel_config::CosmicPanelConfig;
use cosmic_panel_config::{CosmicPanelOuput};
use cosmic_protocols::{
toplevel_info::v1::client::{
zcosmic_toplevel_handle_v1::{self, ZcosmicToplevelHandleV1},
@ -52,12 +52,12 @@ pub fn spawn_toplevels() -> SyncSender<ToplevelEvent> {
.and_then(|s| s.map(|s| Connection::from_socket(s).map_err(anyhow::Error::msg)))
{
std::thread::spawn(move || {
let output = match config.filter_top_levels {
Some(TopLevelFilter::ConfiguredOutput) => {
CosmicPanelConfig::load_from_env().ok().map(|c| c.output)
}
let output = std::env::var("COSMIC_PANEL_OUTPUT").ok().and_then(|size| match size.parse::<CosmicPanelOuput>() {
Ok(CosmicPanelOuput::Name(n)) => Some(n),
// TODO handle Active & panic if the space is still configured for All instead of being assigned a named output
_ => None,
};
});
let mut event_loop = calloop::EventLoop::<State>::try_new().unwrap();
let loop_handle = event_loop.handle();
let event_queue = conn.new_event_queue::<State>();

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

@ -1,9 +1,9 @@
use crate::{
utils::{Activate, WorkspaceEvent},
utils::WorkspaceEvent,
wayland_source::WaylandSource,
};
use calloop::channel::*;
use cosmic_panel_config::CosmicPanelConfig;
use cosmic_panel_config::CosmicPanelOuput;
use cosmic_protocols::workspace::v1::client::{
zcosmic_workspace_group_handle_v1::{self, ZcosmicWorkspaceGroupHandleV1},
zcosmic_workspace_handle_v1::{self, ZcosmicWorkspaceHandleV1},
@ -11,18 +11,15 @@ use cosmic_protocols::workspace::v1::client::{
};
use gtk4::glib;
use std::{
collections::HashMap, env, hash::Hash, mem, os::unix::net::UnixStream, path::PathBuf,
sync::Arc, time::Duration,
env, os::unix::net::UnixStream, path::PathBuf, time::Duration,
};
use tokio::sync::mpsc;
use wayland_backend::client::ObjectData;
use wayland_client::{
event_created_child,
protocol::{
wl_output::{self, WlOutput},
wl_registry,
},
ConnectError, Proxy,
ConnectError,
};
use wayland_client::{Connection, Dispatch, QueueHandle};
@ -42,9 +39,12 @@ pub fn spawn_workspaces(tx: glib::Sender<State>) -> SyncSender<WorkspaceEvent> {
.and_then(|s| s.map(|s| Connection::from_socket(s).map_err(anyhow::Error::msg)))
{
std::thread::spawn(move || {
let output = CosmicPanelConfig::load_from_env()
.unwrap_or_default()
.output;
let output = std::env::var("COSMIC_PANEL_OUTPUT").ok().and_then(|size| match size.parse::<CosmicPanelOuput>() {
Ok(CosmicPanelOuput::Name(n)) => Some(n),
// TODO handle Active & panic if the space is still configured for All instead of being assigned a named output
_ => Some("".to_string()),
}).unwrap_or_default();
let mut event_loop = calloop::EventLoop::<State>::try_new().unwrap();
let loop_handle = event_loop.handle();
let event_queue = conn.new_event_queue::<State>();

3
applets/cosmic-applet-workspaces/src/window/mod.rs
View file

@ -34,9 +34,8 @@ impl CosmicWorkspacesWindow {
..set_title(Some(&fl!("cosmic-applet-workspaces")));
..add_css_class("transparent");
};
let config = CosmicPanelConfig::load_from_env().unwrap_or_default();
let app_list = WorkspaceList::new(config);
let app_list = WorkspaceList::new();
self_.set_child(Some(&app_list));
imp.inner.set(app_list).unwrap();

1
applets/cosmic-applet-workspaces/src/workspace_list/imp.rs
View file

@ -13,7 +13,6 @@ use crate::utils::Activate;
pub struct WorkspaceList {
pub list_view: OnceCell<ListView>,
pub model: OnceCell<gio::ListStore>,
pub config: OnceCell<CosmicPanelConfig>,
}
#[glib::object_subclass]

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

@ -7,15 +7,14 @@ use crate::workspace_button::WorkspaceButton;
use crate::workspace_object::WorkspaceObject;
use crate::TX;
use cascade::cascade;
use cosmic_panel_config::CosmicPanelConfig;
use cosmic_panel_config::PanelAnchor;
use cosmic_panel_config::PanelSize;
use gtk4::builders::EventControllerScrollBuilder;
use gtk4::EventControllerScrollFlags;
use gtk4::Inhibit;
use gtk4::ListView;
use gtk4::Orientation;
use gtk4::SignalListItemFactory;
use gtk4::{gio, glib, prelude::*, subclass::prelude::*};
use tokio::sync::mpsc::Sender;
mod imp;
@ -26,10 +25,9 @@ glib::wrapper! {
}
impl WorkspaceList {
pub fn new(config: CosmicPanelConfig) -> Self {
pub fn new() -> Self {
let self_: WorkspaceList = glib::Object::new(&[]).expect("Failed to create WorkspaceList");
let imp = imp::WorkspaceList::from_instance(&self_);
imp.config.set(config).unwrap();
self_.layout();
//dnd behavior is different for each type, as well as the data in the model
self_.setup_model();
@ -45,7 +43,7 @@ impl WorkspaceList {
fn layout(&self) {
let imp = imp::WorkspaceList::from_instance(self);
let anchor = imp.config.get().unwrap().anchor;
let anchor = std::env::var("COSMIC_PANEL_ANCHOR").ok().and_then(|anchor| anchor.parse::<PanelAnchor>().ok()).unwrap_or_default();
let list_view = cascade! {
ListView::default();
@ -105,7 +103,7 @@ impl WorkspaceList {
let imp = imp::WorkspaceList::from_instance(self);
let factory = SignalListItemFactory::new();
let model = imp.model.get().expect("Failed to get saved app model.");
let icon_size = imp.config.get().unwrap().get_applet_icon_size();
factory.connect_setup(glib::clone!(@weak model => move |_, list_item| {
let workspace_button = WorkspaceButton::new();
list_item.set_child(Some(&workspace_button));

13
applets/cosmic-panel-button/src/apps_window/mod.rs
View file

@ -2,7 +2,7 @@
use crate::fl;
use cascade::cascade;
use cosmic_panel_config::CosmicPanelConfig;
use cosmic_panel_config::{CosmicPanelConfig, PanelSize};
use gtk4::{
gio::{self, DesktopAppInfo, Icon},
glib::{self, Object},
@ -41,7 +41,14 @@ impl CosmicPanelAppButtonWindow {
Button::new();
..add_css_class("apps");
};
let config = CosmicPanelConfig::load_from_env().unwrap_or_default();
let pixels = std::env::var("COSMIC_PANEL_SIZE").ok().and_then(|size| match size.parse::<PanelSize>() {
Ok(PanelSize::XL) => Some(64),
Ok(PanelSize::L) => Some(48),
Ok(PanelSize::M) => Some(36),
Ok(PanelSize::S) => Some(24),
Ok(PanelSize::XS) => Some(18),
Err(_) => Some(36),
}).unwrap_or(36);
let icon = apps_desktop_info.icon().unwrap_or_else(|| {
Icon::for_string("image-missing").expect("Failed to set default icon")
});
@ -50,7 +57,7 @@ impl CosmicPanelAppButtonWindow {
gtk4::Image::from_gicon(&icon);
..set_hexpand(true);
..set_halign(Align::Center);
..set_pixel_size(config.get_applet_icon_size().try_into().unwrap());
..set_pixel_size(pixels);
..set_tooltip_text(Some(&apps_desktop_info.name()));
};
container.append(&image);