diff --git a/crates/adapters/src/wayland/config.rs b/crates/adapters/src/wayland/config.rs index b123878..206c057 100644 --- a/crates/adapters/src/wayland/config.rs +++ b/crates/adapters/src/wayland/config.rs @@ -11,7 +11,7 @@ use smithay_client_toolkit::reexports::protocols_wlr::layer_shell::v1::client::{ use std::rc::Rc; #[derive(Debug, Clone, Copy)] -pub(crate) struct LayerSurfaceParams { +pub(crate) struct LayerSurfaceConfig { pub anchor: Anchor, pub margin: Margins, pub exclusive_zone: i32, diff --git a/crates/adapters/src/wayland/shell_adapter.rs b/crates/adapters/src/wayland/shell_adapter.rs index 6cc45e0..513c178 100644 --- a/crates/adapters/src/wayland/shell_adapter.rs +++ b/crates/adapters/src/wayland/shell_adapter.rs @@ -1,5 +1,5 @@ use crate::wayland::{ - config::{LayerSurfaceParams, WaylandWindowConfig}, + config::{LayerSurfaceConfig, WaylandWindowConfig}, globals::context::GlobalContext, surfaces::layer_surface::{SurfaceCtx, SurfaceSetupParams}, surfaces::popup_manager::{PopupContext, PopupManager}, @@ -103,7 +103,7 @@ impl WaylandWindowingSystem { ) -> Result<(WindowState, GlobalContext, Rc)> { let global_ctx = GlobalContext::initialize(connection, &event_queue.handle())?; - let layer_surface_params = LayerSurfaceParams { + let layer_surface_config = LayerSurfaceConfig { anchor: config.anchor, margin: config.margin, exclusive_zone: config.exclusive_zone, @@ -122,7 +122,7 @@ impl WaylandWindowingSystem { namespace: config.namespace.clone(), }; - let surface_ctx = SurfaceCtx::setup(&setup_params, &layer_surface_params); + let surface_ctx = SurfaceCtx::setup(&setup_params, &layer_surface_config); let window = Self::initialize_renderer(&surface_ctx.surface, &connection.display(), &config)?; diff --git a/crates/adapters/src/wayland/surfaces/layer_surface.rs b/crates/adapters/src/wayland/surfaces/layer_surface.rs index d35a882..02f118c 100644 --- a/crates/adapters/src/wayland/surfaces/layer_surface.rs +++ b/crates/adapters/src/wayland/surfaces/layer_surface.rs @@ -1,4 +1,4 @@ -use crate::wayland::{config::LayerSurfaceParams, surfaces::surface_state::WindowState}; +use crate::wayland::{config::LayerSurfaceConfig, surfaces::surface_state::WindowState}; use log::info; use smithay_client_toolkit::reexports::protocols_wlr::layer_shell::v1::client::{ zwlr_layer_shell_v1::{Layer, ZwlrLayerShellV1}, @@ -38,7 +38,7 @@ pub struct SurfaceCtx { impl SurfaceCtx { pub(crate) fn setup( setup_params: &SurfaceSetupParams<'_>, - params: &LayerSurfaceParams, + config: &LayerSurfaceConfig, ) -> Self { let surface = Rc::new( setup_params @@ -64,7 +64,7 @@ impl SurfaceCtx { Rc::new(vp.get_viewport(&surface, setup_params.queue_handle, ())) }); - Self::configure_layer_surface(&layer_surface, &surface, params); + Self::configure_layer_surface(&layer_surface, &surface, config); surface.set_buffer_scale(1); Self { @@ -78,19 +78,19 @@ impl SurfaceCtx { fn configure_layer_surface( layer_surface: &Rc, surface: &WlSurface, - params: &LayerSurfaceParams, + config: &LayerSurfaceConfig, ) { - layer_surface.set_anchor(params.anchor); + layer_surface.set_anchor(config.anchor); layer_surface.set_margin( - params.margin.top, - params.margin.right, - params.margin.bottom, - params.margin.left, + config.margin.top, + config.margin.right, + config.margin.bottom, + config.margin.left, ); - layer_surface.set_exclusive_zone(params.exclusive_zone); - layer_surface.set_keyboard_interactivity(params.keyboard_interactivity); - layer_surface.set_size(1, params.height); + layer_surface.set_exclusive_zone(config.exclusive_zone); + layer_surface.set_keyboard_interactivity(config.keyboard_interactivity); + layer_surface.set_size(1, config.height); surface.commit(); } }