andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Implement explicit unmapped window state tracking

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-02-23 13:57:56 +04:00
parent af6485cd8c
commit 2317021a7c
8 changed files with 308 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/workspace.rs
+9 -11
View File
@@ -322,17 +322,19 @@ impl<W: LayoutElement> Workspace<W> {
))
}
pub fn new_window_size(
pub fn resolve_default_width(
&self,
default_width: Option<Option<ColumnWidth>>,
) -> Size<i32, Logical> {
let default_width = match default_width {
) -> Option<ColumnWidth> {
match default_width {
Some(Some(width)) => Some(width),
Some(None) => None,
None => self.options.default_width,
};
}
}
let width = if let Some(width) = default_width {
pub fn new_window_size(&self, width: Option<ColumnWidth>) -> Size<i32, Logical> {
let width = if let Some(width) = width {
let mut width = width.resolve(&self.options, self.working_area.size.w);
if !self.options.border.off {
width -= self.options.border.width as i32 * 2;
@@ -350,11 +352,7 @@ impl<W: LayoutElement> Workspace<W> {
Size::from((width, max(height, 1)))
}
pub fn configure_new_window(
&self,
window: &Window,
default_width: Option<Option<ColumnWidth>>,
) {
pub fn configure_new_window(&self, window: &Window, width: Option<ColumnWidth>) {
if let Some(output) = self.output.as_ref() {
set_preferred_scale_transform(window, output);
}
@@ -363,7 +361,7 @@ impl<W: LayoutElement> Workspace<W> {
if state.states.contains(xdg_toplevel::State::Fullscreen) {
state.size = Some(self.view_size);
} else {
state.size = Some(self.new_window_size(default_width));
state.size = Some(self.new_window_size(width));
}
state.bounds = Some(self.toplevel_bounds());