revert 4055, caused crashes plus it should be done differently

This commit is contained in:
simonb 2005-06-19 14:06:34 +00:00
parent c2ec3065f9
commit 3fd472679d
2 changed files with 18 additions and 12 deletions

View file

@ -1,6 +1,8 @@
(Format: Year/Month/Day)
Changes for 0.9.14:
*05/06/19:
* Revert shaded window fix. Wrong approach and caused crashes (Simon)
Window.cc
* Change FbWinFrame to use a Container (Simon)
FbWinFrame.hh/cc Container.hh/cc
*05/06/18:

View file

@ -504,8 +504,19 @@ void FluxboxWindow::init() {
}
associateClientWindow(true, wattrib.x, wattrib.y, wattrib.width, wattrib.height);
Fluxbox::instance()->attachSignals(*this);
// this window is managed, we are now allowed to modify actual state
m_initialized = true;
applyDecorations(true);
grabButtons();
restoreAttributes();
if (m_workspace_number < 0 || m_workspace_number >= screen().getCount())
@ -537,6 +548,8 @@ void FluxboxWindow::init() {
if (wattrib.height <= 0)
wattrib.height = 1;
// if we're a transient then we should be on the same layer as our parent
if (m_client->isTransient() &&
m_client->transientFor()->fbwindow() &&
@ -557,9 +570,12 @@ void FluxboxWindow::init() {
if (!place_window)
moveResize(frame().x(), frame().y(), frame().width(), frame().height());
screen().getWorkspace(m_workspace_number)->addWindow(*this, place_window);
setWorkspace(m_workspace_number);
if (shaded) { // start shaded
shaded = false;
shade();
@ -578,10 +594,6 @@ void FluxboxWindow::init() {
stick();
deiconify(); //we're omnipresent and visible
}
Fluxbox::instance()->attachSignals(*this);
// this window is managed, we are now allowed to modify actual state
m_initialized = true;
sendConfigureNotify();
// no focus default
@ -3533,14 +3545,6 @@ void FluxboxWindow::restore(bool remap) {
#ifdef DEBUG
cerr<<"restore("<<remap<<")"<<endl;
#endif // DEBUG
if (isShaded()) {
if (!isIconic())
setState(NormalState, false);
if (frame().isShaded())
frame().shade();
}
while (!clientList().empty()) {
restore(clientList().back(), remap);
// deleting winClient removes it from the clientList