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

floating: Support default-column-width in most cases

Browse Source 
open-fullscreen + open-floating default width is still not supported in this
commit.
This commit is contained in:
Ivan Molodetskikh
2024-12-27 09:58:22 +03:00
parent 99c0fabee6
commit db6447ed79
85 changed files with 163 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handlers/xdg_shell.rs
+12 -4
View File
@@ -494,6 +494,7 @@ impl XdgShellHandler for State {
InitialConfigureState::Configured {
rules,
width,
floating_width,
is_full_width,
output,
workspace_name,
@@ -548,12 +549,14 @@ impl XdgShellHandler for State {
state.states.unset(xdg_toplevel::State::Fullscreen);
});
let configure_width = if *is_full_width {
let is_floating = rules.compute_open_floating(&toplevel);
let configure_width = if is_floating {
*floating_width
} else if *is_full_width {
Some(ColumnWidth::Proportion(1.))
} else {
*width
};
let is_floating = rules.compute_open_floating(&toplevel);
ws.configure_new_window(
&unmapped.window,
configure_width,
@@ -836,6 +839,7 @@ impl State {
let mon = mon.map(|(mon, _)| mon);
let mut width = None;
let mut floating_width = None;
let is_full_width = rules.open_maximized.unwrap_or(false);
let is_floating = rules.compute_open_floating(toplevel);
@@ -859,9 +863,12 @@ impl State {
});
}
width = ws.resolve_default_width(rules.default_width, is_floating);
width = ws.resolve_default_width(rules.default_width, false);
floating_width = ws.resolve_default_width(rules.default_width, true);
let configure_width = if is_full_width {
let configure_width = if is_floating {
floating_width
} else if is_full_width {
Some(ColumnWidth::Proportion(1.))
} else {
width
@@ -884,6 +891,7 @@ impl State {
*state = InitialConfigureState::Configured {
rules,
width,
floating_width,
is_full_width,
output,
workspace_name: ws.and_then(|w| w.name().cloned()),