feature added, move-column-left-or-monitor-left and move-column-right… #528
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-or-monitor-right
Suyashtnt
reviewed
Jul 7, 2024
|
Shouldn't the action name be |
|
Will you also do |
|
prob not, it's not personally useful to me, and i don't even know if i implemented this right |
YaLTeR
requested changes
Jul 8, 2024
niri-config/src/lib.rs
Outdated
Comment on lines
980
to
981
| MoveColumnLeftOrMonitorLeft, | ||
| MoveColumnRightOrMonitorRight, |
There was a problem hiding this comment.
Suggested change
| MoveColumnLeftOrMonitorLeft, | |
| MoveColumnRightOrMonitorRight, | |
| MoveColumnLeftOrToMonitorLeft, | |
| MoveColumnRightOrToMonitorRight, |
For grammar and consistency sake (like i.e. MoveWindowDownOrToWorkspaceDown)
niri-ipc/src/lib.rs
Outdated
Comment on lines
155
to
158
| /// Move the focused column to the left or to the left monitor | ||
| MoveColumnLeftOrMonitorLeft, | ||
| /// Move the focused column to the right or to the right monitor | ||
| MoveColumnRightOrMonitorRight, |
There was a problem hiding this comment.
Suggested change
| /// Move the focused column to the left or to the left monitor | |
| MoveColumnLeftOrMonitorLeft, | |
| /// Move the focused column to the right or to the right monitor | |
| MoveColumnRightOrMonitorRight, | |
| /// Move the focused column to the left or to the monitor to the left. | |
| MoveColumnLeftOrToMonitorLeft, | |
| /// Move the focused column to the right or to the monitor to the right. | |
| MoveColumnRightOrToMonitorRight, |
src/layout/mod.rs
Outdated
| @@ -1196,6 +1196,36 @@ impl<W: LayoutElement> Layout<W> { | |||
| monitor.move_column_to_last(); | |||
| } | |||
|
|
|||
| pub fn move_column_left_or_output(&mut self, output: &OutputId) -> bool { | |||
There was a problem hiding this comment.
Suggested change
| pub fn move_column_left_or_output(&mut self, output: &OutputId) -> bool { | |
| pub fn move_column_left_or_to_output(&mut self, output: &Output) -> bool { |
These should accept &Output not &OutputId.
src/layout/mod.rs
Outdated
| let workspace = monitor.active_workspace(); | ||
| let curr_idx = workspace.active_column_idx; | ||
|
|
||
| if !workspace.columns.is_empty() && curr_idx != 0 { |
There was a problem hiding this comment.
Suggested change
| if !workspace.columns.is_empty() && curr_idx != 0 { | |
| if !workspace.columns.is_empty() && curr_idx != workspace.columns.len() - 1 { |
src/layout/mod.rs
Outdated
Comment on lines
2830
to
2831
| MoveColumnLeftOrMonitorLeft(#[proptest(strategy = "1..=2u8")] u8), | ||
| MoveColumnRightOrMonitorRight(#[proptest(strategy = "1..=2u8")] u8), |
There was a problem hiding this comment.
Suggested change
| MoveColumnLeftOrMonitorLeft(#[proptest(strategy = "1..=2u8")] u8), | |
| MoveColumnRightOrMonitorRight(#[proptest(strategy = "1..=2u8")] u8), | |
| MoveColumnLeftOrToMonitorLeft(#[proptest(strategy = "1..=2u8")] u8), | |
| MoveColumnRightOrToMonitorRight(#[proptest(strategy = "1..=2u8")] u8), |
6 tasks
|
@YaLTeR, added your fixes, should be ready now |
|
Looks like you've changed the lines that I commented about but not the other lines that depend on them, or the same name used elsewhere |
|
oh yea, sorry |
|
Thanks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
feature added, move-column-left-or-monitor-left and move-column-right-or-monitor-right
based on #456