Skip to content

Commit

Permalink
alignwindow: add middle option
Browse files Browse the repository at this point in the history
  • Loading branch information
@dawsers
dawsers committed Dec 4, 2024
1 parent 7c6f45a commit e5faddf
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 35 deletions.
72 changes: 38 additions & 34 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,37 +122,37 @@ general {

The plugin adds the following dispatchers:

| Dispatcher | Description |
|-----------------------------|-----------------------------------------------------------------------------------------------------------------------------|
| `scroller:movefocus` | An optional replacement for `movefocus`, takes a direction as argument. |
| `scroller:movewindow` | An optional replacement for `movewindow`, takes a direction as argument. |
| `scroller:setmode` | Set mode: `r/row` (default), `c/col/column`. Sets the working mode. Affects most dispatchers and new window creation. |
| `scroller:cyclesize` | Resize the focused column width (*row* mode), or the active window height (*column* mode). |
| `scroller:cyclewidth` | Resize the focused column width. |
| `scroller:cycleheight` | Resize the active window height. |
| `scroller:alignwindow` | Align window on the screen, `l/left`, `c/center`, `r/right` (*row* mode), `c/center`, `u/up`, `d/down` (*col* mode) |
| `scroller:admitwindow` | Push the current window below the active one of the column to its left. |
| `scroller:expelwindow` | Pop the current window out of its column and place it on a new column to the right. |
| `scroller:fitsize` | Resize columns (*row* mode) or windows (*col* mode) so they fit on the screen: `active`, `visible`, `all`, `toend`, `tobeg` |
| `scroller:toggleoverview` | Toggle an overview of the workspace where all the windows are temporarily scaled to fit the monitor |
| `scroller:marksadd` | Add a named mark. Argument is the name of the mark |
| `scroller:marksdelete` | Delete a named mark. Argument is the name of the mark |
| `scroller:marksvisit` | Visit a named mark. Argument is the name of the mark |
| `scroller:marksreset` | Delete all marks |
| `scroller:pin` | Toggle pin a column to its current position. The rest will adapt when changing focus etc. |
| `scroller:selectiontoggle` | Toggle on/off the selection status of a window |
| `scroller:selectionreset` | Resets selection (deselects all windows) |
| `scroller:selectionmove` | Moves the selected windows/columns to the current workspace and location, takes a direction as argument (keeps sizes etc.) |
| `scroller:trailnew` | Creates a new trail |
| `scroller:traildelete` | Deletes the active trail |
| `scroller:trailclear` | Clears all the trailmarks of the current trail |
| `scroller:trailnext` | Moves to next trail |
| `scroller:trailprevious` | Moves to previous trail |
| `scroller:trailtoselection` | Creates a selection from all the windows in the current trail |
| `scroller:trailmarktoggle` | Toggles a trailmark for the current window in the active trail |
| `scroller:trailmarknext` | Moves to next trailmark in the current trail |
| `scroller:trailmarkprevious`| Moves to previous trailmark in the current trail |
| `scroller:jump` | Shows every window on the active monitors for a shortcut-based, quick focus mode |
| Dispatcher | Description |
|-----------------------------|----------------------------------------------------------------------------------------------------------------------------------|
| `scroller:movefocus` | An optional replacement for `movefocus`, takes a direction as argument. |
| `scroller:movewindow` | An optional replacement for `movewindow`, takes a direction as argument. |
| `scroller:setmode` | Set mode: `r/row` (default), `c/col/column`. Sets the working mode. Affects most dispatchers and new window creation. |
| `scroller:cyclesize` | Resize the focused column width (*row* mode), or the active window height (*column* mode). |
| `scroller:cyclewidth` | Resize the focused column width. |
| `scroller:cycleheight` | Resize the active window height. |
| `scroller:alignwindow` | Align window on the screen, `l/left`, `c/center`, `r/right` (*row* mode), `c/center`, `u/up`, `d/down` (*col* mode), `m/middle` |
| `scroller:admitwindow` | Push the current window below the active one of the column to its left. |
| `scroller:expelwindow` | Pop the current window out of its column and place it on a new column to the right. |
| `scroller:fitsize` | Resize columns (*row* mode) or windows (*col* mode) so they fit on the screen: `active`, `visible`, `all`, `toend`, `tobeg` |
| `scroller:toggleoverview` | Toggle an overview of the workspace where all the windows are temporarily scaled to fit the monitor |
| `scroller:marksadd` | Add a named mark. Argument is the name of the mark |
| `scroller:marksdelete` | Delete a named mark. Argument is the name of the mark |
| `scroller:marksvisit` | Visit a named mark. Argument is the name of the mark |
| `scroller:marksreset` | Delete all marks |
| `scroller:pin` | Toggle pin a column to its current position. The rest will adapt when changing focus etc. |
| `scroller:selectiontoggle` | Toggle on/off the selection status of a window |
| `scroller:selectionreset` | Resets selection (deselects all windows) |
| `scroller:selectionmove` | Moves the selected windows/columns to the current workspace and location, takes a direction as argument (keeps sizes etc.) |
| `scroller:trailnew` | Creates a new trail |
| `scroller:traildelete` | Deletes the active trail |
| `scroller:trailclear` | Clears all the trailmarks of the current trail |
| `scroller:trailnext` | Moves to next trail |
| `scroller:trailprevious` | Moves to previous trail |
| `scroller:trailtoselection` | Creates a selection from all the windows in the current trail |
| `scroller:trailmarktoggle` | Toggles a trailmark for the current window in the active trail |
| `scroller:trailmarknext` | Moves to next trailmark in the current trail |
| `scroller:trailmarkprevious`| Moves to previous trailmark in the current trail |
| `scroller:jump` | Shows every window on the active monitors for a shortcut-based, quick focus mode |


## Modes
Expand Down Expand Up @@ -208,16 +208,18 @@ can always align any column to the *center*, *left* or *right* of the monitor
(in *row* mode), or *up* (top), *down* (bottom) or to the *center* in *column*
mode. For example center a column for easier reading, regardless of what happens to
the other columns. As soon as you change focus or move a column, the alignment
is lost.
is lost. You can also center a window on your workspace using *middle*, it
will center its column, and also the window within the column.

`alignwindow` takes a parameter: `l` or `left`, `r` or `right`, `c` or
`center` or `centre`, `u` or `up` and `d` or `down`.
`center` or `centre`, `u` or `up`, `d` or `down`, and `m` or `middle`.

To use *right* or *left* you need to be in *row* mode, and to use *up* or
*down* in *column* mode. *center* behaves differently depending on the mode.
In *row* mode it aligns the active column to the center of the monitor. In
*column* mode, it aligns the active window within its column, to a centered
position.
position. If you want to center a window and its column at the same time,
regardless of which mode you are in, use *middle*.


## Admit/Expel
Expand Down Expand Up @@ -915,6 +917,8 @@ submap = center
# sets repeatable binds for resizing the active window
bind = , C, scroller:alignwindow, c
bind = , C, submap, reset
bind = , m, scroller:alignwindow, m
bind = , m, submap, reset
bind = , right, scroller:alignwindow, r
bind = , right, submap, reset
bind = , left, scroller:alignwindow, l
Expand Down
2 changes: 2 additions & 0 deletions src/dispatchers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ namespace dispatchers {
return Direction::End;
else if (arg == "c" || arg == "center" || arg == "centre")
return Direction::Center;
else if (arg == "m" || arg == "middle")
return Direction::Middle;
else
return Direction::Invalid;
}
Expand Down
2 changes: 1 addition & 1 deletion src/enums.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef SCROLLER_ENUMS_H
#define SCROLLER_ENUMS_H

enum class Direction { Left, Right, Up, Down, Begin, End, Center, Invalid };
enum class Direction { Left, Right, Up, Down, Begin, End, Center, Middle, Invalid };
enum class FitSize { Active, Visible, All, ToEnd, ToBeg };
enum class Mode { Row, Column };

Expand Down
6 changes: 6 additions & 0 deletions src/row.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,12 @@ void Row::align_column(Direction dir)
active->data()->recalculate_col_geometry(gap_x, gap);
return;
} break;
case Direction::Middle: {
const Vector2D gap_x = calculate_gap_x(active);
active->data()->align_window(Direction::Center, gap_x, gap);
center_active_column();
break;
}
default:
return;
}
Expand Down
2 changes: 2 additions & 0 deletions src/scroller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,8 @@ void ScrollerLayout::onWindowCreatedTiling(PHLWINDOW window, eDirection)
s->align_column(Direction::Down);
} else if (dir == "c" || dir == "centre" || dir == "center") {
s->align_column(Direction::Center);
} else if (dir == "m" || dir == "middle") {
s->align_column(Direction::Middle);
}
} else if (r.szRule.starts_with("plugin:scroller:marksadd")) {
const auto mark_name = r.szRule.substr(r.szRule.find_first_of(' ') + 1);
Expand Down

0 comments on commit e5faddf

Please sign in to comment.