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

Fix default width fixed not being honored with borders

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-02-23 14:40:56 +04:00
parent f5b776a947
commit eb2dce1b53
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout/mod.rs
+12 -15
View File
@@ -534,13 +534,12 @@ impl<W: LayoutElement> Layout<W> {
width: Option<ColumnWidth>,
is_full_width: bool,
) -> Option<&Output> {
let width = width.unwrap_or_else(|| {
let mut width = window.size().w;
let mut width = width.unwrap_or_else(|| ColumnWidth::Fixed(window.size().w));
if let ColumnWidth::Fixed(w) = &mut width {
if !self.options.border.off {
width += self.options.border.width as i32 * 2;
*w += self.options.border.width as i32 * 2;
}
ColumnWidth::Fixed(width)
});
}
match &mut self.monitor_set {
MonitorSet::Normal {
@@ -591,13 +590,12 @@ impl<W: LayoutElement> Layout<W> {
width: Option<ColumnWidth>,
is_full_width: bool,
) -> Option<&Output> {
let width = width.unwrap_or_else(|| {
let mut width = window.size().w;
let mut width = width.unwrap_or_else(|| ColumnWidth::Fixed(window.size().w));
if let ColumnWidth::Fixed(w) = &mut width {
if !self.options.border.off {
width += self.options.border.width as i32 * 2;
*w += self.options.border.width as i32 * 2;
}
ColumnWidth::Fixed(width)
});
}
match &mut self.monitor_set {
MonitorSet::Normal { monitors, .. } => {
@@ -628,13 +626,12 @@ impl<W: LayoutElement> Layout<W> {
width: Option<ColumnWidth>,
is_full_width: bool,
) {
let width = width.unwrap_or_else(|| {
let mut width = window.size().w;
let mut width = width.unwrap_or_else(|| ColumnWidth::Fixed(window.size().w));
if let ColumnWidth::Fixed(w) = &mut width {
if !self.options.border.off {
width += self.options.border.width as i32 * 2;
*w += self.options.border.width as i32 * 2;
}
ColumnWidth::Fixed(width)
});
}
let MonitorSet::Normal {
monitors,
src/layout/workspace.rs
+5 -1
View File
@@ -335,10 +335,14 @@ impl<W: LayoutElement> Workspace<W> {
pub fn new_window_size(&self, width: Option<ColumnWidth>) -> Size<i32, Logical> {
let width = if let Some(width) = width {
let is_fixed = matches!(width, ColumnWidth::Fixed(_));
let mut width = width.resolve(&self.options, self.working_area.size.w);
if !self.options.border.off {
if !is_fixed && !self.options.border.off {
width -= self.options.border.width as i32 * 2;
}
max(1, width)
} else {
0