From 6793a163af9efb3205d3ae9d9b264eeeeb1a9dbc Mon Sep 17 00:00:00 2001 From: galister <22305755+galister@users.noreply.github.com> Date: Sat, 13 Dec 2025 21:13:11 +0900 Subject: [PATCH] adjust default screen position to be lower --- wlx-overlay-s/src/overlays/keyboard/builder.rs | 12 ++++++------ wlx-overlay-s/src/overlays/screen/mod.rs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wlx-overlay-s/src/overlays/keyboard/builder.rs b/wlx-overlay-s/src/overlays/keyboard/builder.rs index 66d4e9b..49d9e65 100644 --- a/wlx-overlay-s/src/overlays/keyboard/builder.rs +++ b/wlx-overlay-s/src/overlays/keyboard/builder.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, rc::Rc}; -use glam::{Affine3A, FloatExt, Mat4, Quat, Vec2, Vec3, vec2, vec3}; +use glam::{vec2, vec3, Affine3A, FloatExt, Mat4, Quat, Vec2, Vec3}; use wgui::{ animation::{Animation, AnimationEasing}, assets::AssetPath, @@ -11,10 +11,10 @@ use wgui::{ renderer_vk::util, taffy::{self, prelude::length}, widget::{ - EventResult, div::WidgetDiv, rectangle::{WidgetRectangle, WidgetRectangleParams}, util::WLength, + EventResult, }, }; use wlx_common::windowing::{OverlayWindowState, Positioning}; @@ -22,14 +22,14 @@ use wlx_common::windowing::{OverlayWindowState, Positioning}; use crate::{ gui::panel::GuiPanel, state::AppState, - subsystem::hid::{ALT, CTRL, META, SHIFT, SUPER, XkbKeymap}, + subsystem::hid::{XkbKeymap, ALT, CTRL, META, SHIFT, SUPER}, windowing::window::OverlayWindowConfig, }; use super::{ - KEYBOARD_NAME, KeyButtonData, KeyState, KeyboardBackend, KeyboardState, handle_press, - handle_release, + handle_press, handle_release, layout::{self, AltModifier, KeyCapType}, + KeyButtonData, KeyState, KeyboardBackend, KeyboardState, KEYBOARD_NAME, }; const BACKGROUND_PADDING: f32 = 16.0; @@ -285,7 +285,7 @@ pub fn create_keyboard( transform: Affine3A::from_scale_rotation_translation( Vec3::ONE * width, Quat::from_rotation_x(-10f32.to_radians()), - vec3(0.0, -0.5, -0.5), + vec3(0.0, -0.65, -0.5), ), ..OverlayWindowState::default() }, diff --git a/wlx-overlay-s/src/overlays/screen/mod.rs b/wlx-overlay-s/src/overlays/screen/mod.rs index ebfa6c4..3360d4b 100644 --- a/wlx-overlay-s/src/overlays/screen/mod.rs +++ b/wlx-overlay-s/src/overlays/screen/mod.rs @@ -1,6 +1,6 @@ use std::{f32::consts::PI, sync::Arc}; -use glam::{Affine3A, Quat, Vec3, vec3}; +use glam::{vec3, Affine3A, Quat, Vec3}; use wlx_capture::frame::Transform; use wlx_common::windowing::{OverlayWindowState, Positioning}; @@ -50,7 +50,7 @@ fn create_screen_from_backend( transform: Affine3A::from_scale_rotation_translation( Vec3::ONE * 1.5 * session.config.desktop_view_scale, Quat::from_rotation_z(angle), - vec3(0.0, 0.2, -0.5), + vec3(0.0, 0.0, -0.5), ), ..OverlayWindowState::default() },