Move view functions to a module
This commit is contained in:
Ian Douglas Scott
parent
eb38e3c3ba
commit
f5045286a9
2 changed files with 141 additions and 133 deletions
136
src/main.rs
136
src/main.rs
|
|
@ -43,6 +43,7 @@ use std::{
|
|||
// accept_mime_type, finish_dnd, request_dnd_data, set_actions,
|
||||
|
||||
mod toggle_dbus;
|
||||
mod view;
|
||||
mod wayland;
|
||||
|
||||
static WORKSPACE_MIME: &str = "text/x.cosmic-workspace-id";
|
||||
|
|
@ -491,14 +492,14 @@ impl Application for App {
|
|||
fn view(&self, id: SurfaceId) -> cosmic::Element<Msg> {
|
||||
use iced::widget::*;
|
||||
if let Some(surface) = self.layer_surfaces.get(&id) {
|
||||
return layer_surface(self, surface);
|
||||
return view::layer_surface(self, surface);
|
||||
}
|
||||
if let Some((drag_id, drag_surface, size)) = &self.drag_surface {
|
||||
if drag_id == &id {
|
||||
match drag_surface {
|
||||
DragSurface::Workspace { output, name } => {
|
||||
if let Some(workspace) = self.workspaces.iter().find(|x| &x.name == name) {
|
||||
let item = workspace_item(workspace, output);
|
||||
let item = view::workspace_item(workspace, output);
|
||||
return widget::container(item)
|
||||
.height(iced::Length::Fixed(size.height))
|
||||
.width(iced::Length::Fixed(size.width))
|
||||
|
|
@ -517,137 +518,6 @@ impl Application for App {
|
|||
}
|
||||
}
|
||||
|
||||
fn layer_surface<'a>(app: &'a App, surface: &'a LayerSurface) -> cosmic::Element<'a, Msg> {
|
||||
widget::row![
|
||||
workspaces_sidebar(
|
||||
app.workspaces
|
||||
.iter()
|
||||
.filter(|i| i.outputs.contains(&surface.output)),
|
||||
&surface.output
|
||||
),
|
||||
toplevel_previews(app.toplevels.iter().filter(|i| {
|
||||
if !i.info.output.contains(&surface.output) {
|
||||
return false;
|
||||
}
|
||||
|
||||
i.info.workspace.iter().any(|workspace| {
|
||||
app.workspace_for_handle(workspace)
|
||||
.map_or(false, |x| x.is_active)
|
||||
})
|
||||
}))
|
||||
]
|
||||
.spacing(12)
|
||||
.height(iced::Length::Fill)
|
||||
.width(iced::Length::Fill)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn close_button(on_press: Msg) -> cosmic::Element<'static, Msg> {
|
||||
cosmic::widget::button(cosmic::widget::icon::from_name("window-close-symbolic").size(16))
|
||||
.style(cosmic::theme::Button::Destructive)
|
||||
.on_press(on_press)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn workspace_item<'a>(
|
||||
workspace: &'a Workspace,
|
||||
output: &wl_output::WlOutput,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
// TODO style
|
||||
let theme = if workspace.is_active {
|
||||
cosmic::theme::Button::Suggested
|
||||
} else {
|
||||
cosmic::theme::Button::Standard
|
||||
};
|
||||
widget::column![
|
||||
close_button(Msg::CloseWorkspace(workspace.handle.clone())),
|
||||
cosmic::widget::button(widget::column![
|
||||
widget::Image::new(
|
||||
workspace
|
||||
.img_for_output
|
||||
.get(output)
|
||||
.cloned()
|
||||
.unwrap_or_else(|| widget::image::Handle::from_pixels(
|
||||
1,
|
||||
1,
|
||||
vec![0, 0, 0, 255]
|
||||
))
|
||||
),
|
||||
widget::text(&workspace.name)
|
||||
])
|
||||
.style(theme)
|
||||
.on_press(Msg::ActivateWorkspace(workspace.handle.clone())),
|
||||
]
|
||||
.height(iced::Length::Fill)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn workspace_sidebar_entry<'a>(
|
||||
workspace: &'a Workspace,
|
||||
output: &'a wl_output::WlOutput,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
widget::dnd_source(workspace_item(workspace, output))
|
||||
.on_drag(|size| {
|
||||
Msg::StartDrag(
|
||||
size,
|
||||
DragSurface::Workspace {
|
||||
name: workspace.name.to_string(),
|
||||
output: output.clone(),
|
||||
},
|
||||
)
|
||||
})
|
||||
.on_finished(Msg::SourceFinished)
|
||||
.on_cancelled(Msg::SourceFinished)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn workspaces_sidebar<'a>(
|
||||
workspaces: impl Iterator<Item = &'a Workspace>,
|
||||
output: &'a wl_output::WlOutput,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
widget::container(
|
||||
widget::dnd_listener(widget::column(
|
||||
workspaces
|
||||
.map(|w| workspace_sidebar_entry(w, output))
|
||||
.collect(),
|
||||
))
|
||||
.on_enter(Msg::DndWorkspaceEnter)
|
||||
.on_exit(Msg::DndWorkspaceLeave)
|
||||
.on_drop(Msg::DndWorkspaceDrop)
|
||||
.on_data(Msg::DndWorkspaceData),
|
||||
)
|
||||
.width(iced::Length::Fill)
|
||||
.height(iced::Length::Fill)
|
||||
.into()
|
||||
|
||||
// New workspace
|
||||
}
|
||||
|
||||
fn toplevel_preview(toplevel: &Toplevel) -> cosmic::Element<Msg> {
|
||||
widget::column![
|
||||
close_button(Msg::CloseToplevel(toplevel.handle.clone())),
|
||||
widget::button(widget::Image::new(toplevel.img.clone().unwrap_or_else(
|
||||
|| widget::image::Handle::from_pixels(1, 1, vec![0, 0, 0, 255]),
|
||||
)))
|
||||
.on_press(Msg::ActivateToplevel(toplevel.handle.clone())),
|
||||
widget::text(&toplevel.info.title)
|
||||
.horizontal_alignment(iced::alignment::Horizontal::Center)
|
||||
]
|
||||
.width(iced::Length::Fill)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn toplevel_previews<'a>(
|
||||
toplevels: impl Iterator<Item = &'a Toplevel>,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
widget::row(toplevels.map(toplevel_preview).collect())
|
||||
.width(iced::Length::FillPortion(4))
|
||||
.height(iced::Length::Fill)
|
||||
.spacing(16)
|
||||
.align_items(iced::Alignment::Center)
|
||||
.into()
|
||||
}
|
||||
|
||||
pub fn main() -> iced::Result {
|
||||
env_logger::init();
|
||||
|
||||
|
|
|
|||
138
src/view/mod.rs
Normal file
138
src/view/mod.rs
Normal file
|
|
@ -0,0 +1,138 @@
|
|||
use cctk::wayland_client::protocol::wl_output;
|
||||
use cosmic::iced::{self, widget};
|
||||
|
||||
use crate::{App, DragSurface, LayerSurface, Msg, Toplevel, Workspace};
|
||||
|
||||
pub(crate) fn layer_surface<'a>(
|
||||
app: &'a App,
|
||||
surface: &'a LayerSurface,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
widget::row![
|
||||
workspaces_sidebar(
|
||||
app.workspaces
|
||||
.iter()
|
||||
.filter(|i| i.outputs.contains(&surface.output)),
|
||||
&surface.output
|
||||
),
|
||||
toplevel_previews(app.toplevels.iter().filter(|i| {
|
||||
if !i.info.output.contains(&surface.output) {
|
||||
return false;
|
||||
}
|
||||
|
||||
i.info.workspace.iter().any(|workspace| {
|
||||
app.workspace_for_handle(workspace)
|
||||
.map_or(false, |x| x.is_active)
|
||||
})
|
||||
}))
|
||||
]
|
||||
.spacing(12)
|
||||
.height(iced::Length::Fill)
|
||||
.width(iced::Length::Fill)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn close_button(on_press: Msg) -> cosmic::Element<'static, Msg> {
|
||||
cosmic::widget::button(cosmic::widget::icon::from_name("window-close-symbolic").size(16))
|
||||
.style(cosmic::theme::Button::Destructive)
|
||||
.on_press(on_press)
|
||||
.into()
|
||||
}
|
||||
|
||||
pub(crate) fn workspace_item<'a>(
|
||||
workspace: &'a Workspace,
|
||||
output: &wl_output::WlOutput,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
// TODO style
|
||||
let theme = if workspace.is_active {
|
||||
cosmic::theme::Button::Suggested
|
||||
} else {
|
||||
cosmic::theme::Button::Standard
|
||||
};
|
||||
widget::column![
|
||||
close_button(Msg::CloseWorkspace(workspace.handle.clone())),
|
||||
cosmic::widget::button(widget::column![
|
||||
widget::Image::new(
|
||||
workspace
|
||||
.img_for_output
|
||||
.get(output)
|
||||
.cloned()
|
||||
.unwrap_or_else(|| widget::image::Handle::from_pixels(
|
||||
1,
|
||||
1,
|
||||
vec![0, 0, 0, 255]
|
||||
))
|
||||
),
|
||||
widget::text(&workspace.name)
|
||||
])
|
||||
.style(theme)
|
||||
.on_press(Msg::ActivateWorkspace(workspace.handle.clone())),
|
||||
]
|
||||
.height(iced::Length::Fill)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn workspace_sidebar_entry<'a>(
|
||||
workspace: &'a Workspace,
|
||||
output: &'a wl_output::WlOutput,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
widget::dnd_source(workspace_item(workspace, output))
|
||||
.on_drag(|size| {
|
||||
Msg::StartDrag(
|
||||
size,
|
||||
DragSurface::Workspace {
|
||||
name: workspace.name.to_string(),
|
||||
output: output.clone(),
|
||||
},
|
||||
)
|
||||
})
|
||||
.on_finished(Msg::SourceFinished)
|
||||
.on_cancelled(Msg::SourceFinished)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn workspaces_sidebar<'a>(
|
||||
workspaces: impl Iterator<Item = &'a Workspace>,
|
||||
output: &'a wl_output::WlOutput,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
widget::container(
|
||||
widget::dnd_listener(widget::column(
|
||||
workspaces
|
||||
.map(|w| workspace_sidebar_entry(w, output))
|
||||
.collect(),
|
||||
))
|
||||
.on_enter(Msg::DndWorkspaceEnter)
|
||||
.on_exit(Msg::DndWorkspaceLeave)
|
||||
.on_drop(Msg::DndWorkspaceDrop)
|
||||
.on_data(Msg::DndWorkspaceData),
|
||||
)
|
||||
.width(iced::Length::Fill)
|
||||
.height(iced::Length::Fill)
|
||||
.into()
|
||||
|
||||
// New workspace
|
||||
}
|
||||
|
||||
fn toplevel_preview(toplevel: &Toplevel) -> cosmic::Element<Msg> {
|
||||
widget::column![
|
||||
close_button(Msg::CloseToplevel(toplevel.handle.clone())),
|
||||
widget::button(widget::Image::new(toplevel.img.clone().unwrap_or_else(
|
||||
|| widget::image::Handle::from_pixels(1, 1, vec![0, 0, 0, 255]),
|
||||
)))
|
||||
.on_press(Msg::ActivateToplevel(toplevel.handle.clone())),
|
||||
widget::text(&toplevel.info.title)
|
||||
.horizontal_alignment(iced::alignment::Horizontal::Center)
|
||||
]
|
||||
.width(iced::Length::Fill)
|
||||
.into()
|
||||
}
|
||||
|
||||
fn toplevel_previews<'a>(
|
||||
toplevels: impl Iterator<Item = &'a Toplevel>,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
widget::row(toplevels.map(toplevel_preview).collect())
|
||||
.width(iced::Length::FillPortion(4))
|
||||
.height(iced::Length::Fill)
|
||||
.spacing(16)
|
||||
.align_items(iced::Alignment::Center)
|
||||
.into()
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue