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

Switch back to libcosmic upstream

Browse source
This commit is contained in:
Eduardo Flores 2023-09-18 08:31:27 -07:00 • committed by Ashley Wulber
parent c7b25daa71
commit 276ecc7d6c
19 changed files with 247 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cosmic-applet-status-area/src/components/app.rs
View file

@ -50,7 +50,7 @@ impl App {
}
fn resize_window(&self) -> Command<Msg> {
let icon_size = self.core.applet_helper.suggested_size().0 as u32 + APPLET_PADDING * 2;
let icon_size = self.core.applet.suggested_size().0 as u32 + APPLET_PADDING * 2;
let n = self.menus.len() as u32;
resize_window(window::Id(0), 1.max(icon_size * n), icon_size)
}
@ -81,7 +81,7 @@ impl cosmic::Application for App {
}
fn style(&self) -> Option<<Theme as application::StyleSheet>::Style> {
Some(app::applet::style())
Some(cosmic::applet::style())
}
fn update(&mut self, message: Msg) -> Command<Msg> {
@ -144,7 +144,7 @@ impl cosmic::Application for App {
if self.open_menu.is_some() {
if self.popup.is_none() {
let id = self.next_popup_id();
let popup_settings = self.core.applet_helper.get_popup_settings(
let popup_settings = self.core.applet.get_popup_settings(
window::Id(0),
id,
None,
@ -181,7 +181,7 @@ impl cosmic::Application for App {
.iter()
.map(|(id, menu)| {
self.core
.applet_helper
.applet
.icon_button(menu.icon_name())
.on_press(Msg::TogglePopup(*id))
.into()
@ -196,7 +196,7 @@ impl cosmic::Application for App {
Some(id) => match self.menus.get(&id) {
Some(menu) => self
.core
.applet_helper
.applet
.popup_container(menu.popup_view().map(move |msg| Msg::StatusMenu((id, msg))))
.into(),
None => unreachable!(),
@ -211,5 +211,5 @@ impl cosmic::Application for App {
}
pub fn main() -> iced::Result {
app::applet::run::<App>(true, ())
cosmic::applet::run::<App>(true, ())
}

4
cosmic-applet-status-area/src/components/status_menu.rs
View file

@ -1,4 +1,4 @@
use cosmic::app::applet::applet_button_theme;
use cosmic::applet::button_theme;
use cosmic::iced;
use crate::subscriptions::status_notifier_item::{Layout, StatusNotifierItem};
@ -167,7 +167,7 @@ fn row_button(content: Vec<cosmic::Element<Msg>>) -> cosmic::widget::Button<Msg,
.align_items(iced::Alignment::Center)
.width(iced::Length::Fill),
)
.style(applet_button_theme())
.style(button_theme())
.width(iced::Length::Fill)
.padding([8, 24])
}