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

really fix placement when head is remembered but not position

Browse source
This commit is contained in:
markt 2007-10-24 03:44:39 +00:00
parent 42ace97775
commit b504021145
8 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CascadePlacement.cc
View file

@ -46,7 +46,7 @@ bool CascadePlacement::placeWindow(const std::list<FluxboxWindow *> &windowlist,
const FluxboxWindow &win,
int &place_x, int &place_y) {
int head = (signed) win.screen().getCurrHead();
int head = (signed) win.getOnHead();
int head_left = (signed) win.screen().maxLeft(head);
int head_right = (signed) win.screen().maxRight(head);
int head_top = (signed) win.screen().maxTop(head);

2
src/ColSmartPlacement.cc
View file

@ -32,7 +32,7 @@ bool ColSmartPlacement::placeWindow(const std::list<FluxboxWindow *> &windowlist
int &place_x, int &place_y) {
// xinerama head constraints
int head = (signed) win.screen().getCurrHead();
int head = (signed) win.getOnHead();
int head_left = (signed) win.screen().maxLeft(head);
int head_right = (signed) win.screen().maxRight(head);
int head_top = (signed) win.screen().maxTop(head);

2
src/MinOverlapPlacement.cc
View file

@ -39,7 +39,7 @@ bool MinOverlapPlacement::placeWindow(
const FluxboxWindow &win, int &place_x, int &place_y) {
// view (screen + head) constraints
int head = (signed) win.screen().getCurrHead();
int head = (signed) win.getOnHead();
int head_left = (signed) win.screen().maxLeft(head);
int head_right = (signed) win.screen().maxRight(head);
int head_top = (signed) win.screen().maxTop(head);

2
src/RowSmartPlacement.cc
View file

@ -35,7 +35,7 @@ bool RowSmartPlacement::placeWindow(const std::list<FluxboxWindow *> &windowlist
int next_x, next_y;
// view (screen + head) constraints
int head = (signed) win.screen().getCurrHead();
int head = (signed) win.getOnHead();
int head_left = (signed) win.screen().maxLeft(head);
int head_right = (signed) win.screen().maxRight(head);
int head_top = (signed) win.screen().maxTop(head);

2
src/ScreenPlacement.cc
View file

@ -88,7 +88,7 @@ bool ScreenPlacement::placeWindow(const std::list<FluxboxWindow *> &windowlist,
}
// view (screen + head) constraints
int head = (signed) win.screen().getCurrHead();
int head = (signed) win.getOnHead();
int head_left = (signed) win.screen().maxLeft(head);
int head_right = (signed) win.screen().maxRight(head);
int head_top = (signed) win.screen().maxTop(head);

2
src/UnderMousePlacement.cc
View file

@ -51,7 +51,7 @@ bool UnderMousePlacement::placeWindow(const std::list<FluxboxWindow *> &list,
int test_y = root_y - (win_h / 2);
// keep the window inside the screen
int head = (signed) win.screen().getCurrHead();
int head = (signed) win.getOnHead();
int head_left = (signed) win.screen().maxLeft(head);
int head_right = (signed) win.screen().maxRight(head);
int head_top = (signed) win.screen().maxTop(head);

6
src/Window.cc
View file

@ -480,6 +480,8 @@ void FluxboxWindow::init() {
real_y <= (signed) screen().height())
m_placed = true;
} else if (!m_placed) {
setOnHead(screen().getCurrHead());
}
/*
if (wattrib.width <= 0)
@ -4096,6 +4098,10 @@ int FluxboxWindow::getDecoMaskFromString(const string &str_label) {
return mask;
}
int FluxboxWindow::getOnHead() const {
return screen().getHead(fbWindow());
}
void FluxboxWindow::setOnHead(int head) {
if (head > 0 && head <= screen().numHeads()) {
int cur = screen().getHead(fbWindow());

1
src/Window.hh
View file

@ -306,6 +306,7 @@ public:
void lowerLayer();
/// moves the window to a new layer
void moveToLayer(int layernum, bool force = false);
int getOnHead() const;
void setOnHead(int head);
/// sets the window focus hidden state
void setFocusHidden(bool value);