nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Relative aligmment when changing window head

Browse source 
So far, altering the head would potentially move the window
out of the workspace area (by moving a far right/bottom window from a
HUUUUUGE to a small screen)

This preserves edge alignments (w/ topleft preference), otherwise
moves the window to it's relative topleft position on the new head
(ie. if it was 10% left and 3% top into the screen, it will still be)
This commit is contained in:
Thomas Lübking 2016-08-29 22:15:20 +02:00
parent a5b5be5e09
commit 6c4d1123c0
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Window.cc
View file

@ -3926,8 +3926,21 @@ void FluxboxWindow::setOnHead(int head) {
if (head > 0 && head <= screen().numHeads()) {
int cur = screen().getHead(fbWindow());
bool placed = m_placed;
move(screen().getHeadX(head) + frame().x() - screen().getHeadX(cur),
screen().getHeadY(head) + frame().y() - screen().getHeadY(cur));
int x = frame().x(), y = frame().y();
const int w = frame().width(), h = frame().height(), bw = frame().window().borderWidth();
const int sx = screen().getHeadX(cur), sw = screen().getHeadWidth(cur),
sy = screen().getHeadY(cur), sh = screen().getHeadHeight(cur);
int d = sx + sw - (x + bw + w);
if (std::abs(sx - x) > bw && std::abs(d) <= bw) // right aligned
x = screen().getHeadX(head) + screen().getHeadWidth(head) - (w + bw + d);
else // calc top-left relative position
x = screen().getHeadWidth(head) * (x - sx) / sw + screen().getHeadX(head);
d = sy + sh - (y + bw + h);
if (std::abs(sy - y) > bw && std::abs(d) <= bw) // bottom aligned
y = screen().getHeadY(head) + screen().getHeadHeight(head) - (h + bw + d);
else // calc top-left relative position
y = screen().getHeadHeight(head) * (y - sy) / sh + screen().getHeadY(head);
move(x, y);
m_placed = placed;
}