Miroirs/pinnacle
1
0
Fork 0
mirror of https://github.com/pinnacle-comp/pinnacle.git synced 2024-12-26 21:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add corner layout

Browse source
This commit is contained in:
Ottatop 2023-07-17 20:40:56 -05:00 committed by Ottatop
parent e6eb0c67ff
commit f6784da8a8
3 changed files with 137 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
api/lua/example_config.lua
View file

@ -66,7 +66,15 @@ require("pinnacle").setup(function(pinnacle)
end) end)
---@type Layout[] ---@type Layout[]
local layouts = { "MasterStack", "Dwindle", "Spiral" } local layouts = {
"MasterStack",
"Dwindle",
"Spiral",
"CornerTopLeft",
"CornerTopRight",
"CornerBottomLeft",
"CornerBottomRight",
}
local index = 1 local index = 1
input.keybind({ mod_key }, keys.space, function() input.keybind({ mod_key }, keys.space, function()

4
api/lua/tag.lua
View file

@ -8,6 +8,10 @@
---| "MasterStack" # One master window on the left with all other windows stacked to the right. ---| "MasterStack" # One master window on the left with all other windows stacked to the right.
---| "Dwindle" # Windows split in half towards the bottom right corner. ---| "Dwindle" # Windows split in half towards the bottom right corner.
---| "Spiral" # Windows split in half in a spiral. ---| "Spiral" # Windows split in half in a spiral.
---| "CornerTopLeft" # One main corner window in the top left with a column of windows on the right and a row on the bottom.
---| "CornerTopRight" # One main corner window in the top right with a column of windows on the left and a row on the bottom.
---| "CornerBottomLeft" # One main corner window in the bottom left with a column of windows on the right and a row on the top.
---| "CornerBottomRight" # One main corner window in the bottom right with a column of windows on the left and a row on the top.
local tag = {} local tag = {}

130
src/layout.rs
View file

@ -364,7 +364,10 @@ impl Layout {
} }
} }
} }
Layout::CornerTopLeft => match windows.len() { layout @ (Layout::CornerTopLeft
| Layout::CornerTopRight
| Layout::CornerBottomLeft
| Layout::CornerBottomRight) => match windows.len() {
0 => (), 0 => (),
1 => { 1 => {
windows[0].toplevel().with_pending_state(|state| { windows[0].toplevel().with_pending_state(|state| {
@ -410,20 +413,135 @@ impl Layout {
} }
}); });
let div_factor = 2;
corner.toplevel().with_pending_state(|state| { corner.toplevel().with_pending_state(|state| {
state.size = Some((output_geo.size.w / 2, output_geo.size.h / 2).into()); state.size = Some(
(
output_geo.size.w / div_factor,
output_geo.size.h / div_factor,
)
.into(),
);
}); });
corner.with_state(|state| { corner.with_state(|state| {
state.resize_state = WindowResizeState::Requested( state.resize_state = WindowResizeState::Requested(
corner.toplevel().send_configure(), corner.toplevel().send_configure(),
(output_loc.x, output_loc.y).into(), match layout {
Layout::CornerTopLeft => (output_loc.x, output_loc.y),
Layout::CornerTopRight => (
output_loc.x + output_geo.size.w
- output_geo.size.w / div_factor,
output_loc.y,
),
Layout::CornerBottomLeft => (
output_loc.x,
output_loc.y + output_geo.size.h
- output_geo.size.h / div_factor,
),
Layout::CornerBottomRight => (
output_loc.x + output_geo.size.w
- output_geo.size.w / div_factor,
output_loc.y + output_geo.size.h
- output_geo.size.h / div_factor,
),
_ => unreachable!(),
}
.into(),
); );
}); });
let vert_stack_count = vert_stack.len();
let height = output_geo.size.h as f32 / vert_stack_count as f32;
let mut y_s = vec![];
for i in 0..vert_stack_count {
y_s.push((i as f32 * height).round() as i32);
}
let heights = y_s
.windows(2)
.map(|pair| pair[1] - pair[0])
.chain(vec![output_geo.size.h - y_s.last().expect("vec was empty")])
.collect::<Vec<_>>();
for (i, win) in vert_stack.iter().enumerate() {
win.toplevel().with_pending_state(|state| {
// INFO: Some windows crash the compositor if they become too short in height,
// | so they're limited to a minimum of 40 pixels as a workaround.
state.size =
Some((output_geo.size.w / 2, i32::max(heights[i], 40)).into());
});
win.with_state(|state| {
state.resize_state = WindowResizeState::Requested(
win.toplevel().send_configure(),
(
match layout {
Layout::CornerTopLeft | Layout::CornerBottomLeft => {
output_geo.size.w / 2 + output_loc.x
}
Layout::CornerTopRight | Layout::CornerBottomRight => {
output_loc.x
}
_ => unreachable!(),
},
y_s[i] + output_loc.y,
)
.into(),
);
});
}
let horiz_stack_count = horiz_stack.len();
let width = output_geo.size.w as f32 / 2.0 / horiz_stack_count as f32;
let mut x_s = vec![];
for i in 0..horiz_stack_count {
x_s.push((i as f32 * width).round() as i32);
}
let widths = x_s
.windows(2)
.map(|pair| pair[1] - pair[0])
.chain(vec![
output_geo.size.w / 2 - x_s.last().expect("vec was empty"),
])
.collect::<Vec<_>>();
for (i, win) in horiz_stack.iter().enumerate() {
win.toplevel().with_pending_state(|state| {
// INFO: Some windows crash the compositor if they become too short in height,
// | so they're limited to a minimum of 40 pixels as a workaround.
state.size =
Some((i32::max(widths[i], 1), output_geo.size.h / 2).into());
});
win.with_state(|state| {
state.resize_state = WindowResizeState::Requested(
win.toplevel().send_configure(),
match layout {
Layout::CornerTopLeft => (
x_s[i] + output_loc.x,
output_loc.y + output_geo.size.h / 2,
),
Layout::CornerTopRight => (
x_s[i] + output_loc.x + output_geo.size.w / 2,
output_loc.y + output_geo.size.h / 2,
),
Layout::CornerBottomLeft => {
(x_s[i] + output_loc.x, output_loc.y)
}
Layout::CornerBottomRight => (
x_s[i] + output_loc.x + output_geo.size.w / 2,
output_loc.y,
),
_ => unreachable!(),
}
.into(),
);
});
}
} }
}, },
Layout::CornerTopRight => todo!(),
Layout::CornerBottomLeft => todo!(),
Layout::CornerBottomRight => todo!(),
} }
} }
} }