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

deps: Unify iced version used by cosmic-comp and cosmic-time

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-06-02 13:11:06 +02:00
parent 53c6af5b21
commit 359cf70b49
5 changed files with 93 additions and 910 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/shell/element/stack.rs
View file

@ -5,7 +5,7 @@ use crate::{
wayland::handlers::screencopy::ScreencopySessions,
};
use calloop::LoopHandle;
use cosmic::Element;
use cosmic::{iced_core::Color, Element};
use cosmic_protocols::screencopy::v1::server::zcosmic_screencopy_session_v1::InputType;
use smithay::{
backend::{
@ -311,8 +311,8 @@ impl Program for CosmicStackInternal {
mask.clone().unwrap()
}
fn background_color(&self) -> iced_core::Color {
iced_core::Color {
fn background_color(&self) -> Color {
Color {
r: 0.1176,
g: 0.1176,
b: 0.1176,

8
src/shell/element/window.rs
View file

@ -12,7 +12,7 @@ use crate::{
wayland::handlers::screencopy::ScreencopySessions,
};
use calloop::LoopHandle;
use cosmic::iced::Command;
use cosmic::{iced::Command, iced_core::Color};
use cosmic_protocols::screencopy::v1::server::zcosmic_screencopy_session_v1::InputType;
use smithay::{
backend::{
@ -258,16 +258,16 @@ impl Program for CosmicWindowInternal {
mask.clone().unwrap()
}
fn background_color(&self) -> iced_core::Color {
fn background_color(&self) -> Color {
if self.window.is_activated() {
iced_core::Color {
Color {
r: 0.1176,
g: 0.1176,
b: 0.1176,
a: 1.0,
}
} else {
iced_core::Color {
Color {
r: 0.153,
g: 0.153,
b: 0.153,