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

re-use position sanitization for modal placement

Browse source
This commit is contained in:
Thomas Lübking 2016-08-31 15:57:50 +02:00
parent 6ca6422344
commit 0d1b204121
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Window.cc
View file

@ -457,11 +457,7 @@ void FluxboxWindow::init() {
setWindowType(m_client->getWindowType());
if (fluxbox.isStartup()) {
m_placed = true;
} else if (m_client->normal_hint_flags & (PPosition|USPosition)) {
m_placed = true;
// sanitize explicit position
auto sanitizePosition = [&]() {
int head = screen().getHead(fbWindow());
if (head == 0 && screen().hasXinerama())
head = screen().getCurrHead();
@ -489,6 +485,13 @@ void FluxboxWindow::init() {
top = frame().y();
}
frame().move(left, top);
};
if (fluxbox.isStartup()) {
m_placed = true;
} else if (m_client->normal_hint_flags & (PPosition|USPosition)) {
m_placed = true;
sanitizePosition();
} else {
if (!isWindowVisibleOnSomeHeadOrScreen(*this)) {
// this probably should never happen, but if a window
@ -544,6 +547,7 @@ void FluxboxWindow::init() {
const int x = twin->frame().x() + int(twin->frame().width() - frame().width())/2;
const int y = twin->frame().y() + int(twin->frame().height() - frame().height())/2;
frame().move(x, y);
sanitizePosition();
m_placed = true;
} else // if no parent then set default layer
moveToLayer(m_state.layernum, m_state.layernum != ::ResourceLayer::NORMAL);