Merge upstream/master (COSMIC 1.6) into main
Aligne le fork sur epoch-1.6.0 (63 commits amont) en preservant les 19 commits yoda. Resolutions notables : - les cfg `all(feature = "wayland", target_os = "linux")` deviennent l alias `wayland_platform` introduit en amont ; il exclut winit comme le faisait le patch yoda45eaaf16, l intention est donc preservee ; - les features iced `cctk` ont ete renommees `wayland` en amont, la feature `wayland` locale est adaptee ; `winit` reste un marqueur vide et `iced/winit` est liste explicitement ; - cctk/ashpd gardent leurs chemins locaux dans la section conditionnelle unix introduite en amont ; - la garde anti-crashc0b653f5(context_menu non assigne) est conservee par-dessus la nouvelle structure amont ; - traductions ca/oc restaurees depuis amont. Le submodule iced suit (merge + correctif du cfg cctk residuel). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
commit
9535ada4d0
60 changed files with 3187 additions and 1528 deletions
|
|
@ -5,7 +5,7 @@ use cosmic::iced::core::{id, Alignment, Length, Point};
|
|||
use cosmic::iced::widget::{column, container, scrollable, text};
|
||||
use cosmic::iced::{self, event, window, Subscription};
|
||||
use cosmic::prelude::*;
|
||||
use cosmic::widget::{button, header_bar};
|
||||
use cosmic::widget::{button, header_bar, selectable_text};
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub enum Message {
|
||||
|
|
@ -132,10 +132,14 @@ impl cosmic::Application for MultiWindow {
|
|||
let new_window_button = button::custom(text("New Window")).on_press(Message::NewWindow);
|
||||
|
||||
let content = scrollable(
|
||||
column![input, new_window_button]
|
||||
.spacing(50)
|
||||
.width(Length::Fill)
|
||||
.align_x(Alignment::Center),
|
||||
column![
|
||||
input,
|
||||
new_window_button,
|
||||
selectable_text::title1("I'm selectable...")
|
||||
]
|
||||
.spacing(50)
|
||||
.width(Length::Fill)
|
||||
.align_x(Alignment::Center),
|
||||
);
|
||||
|
||||
let window_content = container(container(content).center_x(Length::Fixed(200.)))
|
||||
|
|
@ -146,7 +150,14 @@ impl cosmic::Application for MultiWindow {
|
|||
if id == self.core.main_window_id().unwrap() {
|
||||
window_content.into()
|
||||
} else {
|
||||
column![header_bar().focused(focused), window_content].into()
|
||||
container(column![
|
||||
header_bar()
|
||||
.on_close(Message::CloseWindow(id))
|
||||
.focused(focused),
|
||||
window_content
|
||||
])
|
||||
.class(cosmic::theme::Container::WindowBackground)
|
||||
.into()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue