summaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 890a4e0..15f7e0e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.144 2003/04/20 02:47:14 rathnor Exp $ 25// $Id: Window.cc,v 1.145 2003/04/25 09:07:09 rathnor Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -409,9 +409,6 @@ void FluxboxWindow::init() {
409 409
410 upsize(); 410 upsize();
411 411
412 m_frame.move(wattrib.x, wattrib.y);
413 m_frame.resizeForClient(wattrib.width, wattrib.height);
414
415 bool place_window = true; 412 bool place_window = true;
416 if (fluxbox->isStartup() || transient || 413 if (fluxbox->isStartup() || transient ||
417 m_client->normal_hint_flags & (PPosition|USPosition)) { 414 m_client->normal_hint_flags & (PPosition|USPosition)) {
@@ -444,15 +441,19 @@ void FluxboxWindow::init() {
444 441
445 restoreAttributes(); 442 restoreAttributes();
446 443
444 m_frame.move(wattrib.x, wattrib.y);
445 m_frame.resizeForClient(wattrib.width, wattrib.height);
446
447 // if we're a transient then we should be on the same layer as our parent 447 // if we're a transient then we should be on the same layer as our parent
448 if (isTransient()) 448 if (isTransient())
449 getLayerItem().setLayer(getTransientFor()->getLayerItem().getLayer()); 449 getLayerItem().setLayer(getTransientFor()->getLayerItem().getLayer());
450 else // if no parent then set default layer 450 else // if no parent then set default layer
451 moveToLayer(m_layernum); 451 moveToLayer(m_layernum);
452 452
453 screen.getWorkspace(workspace_number)->addWindow(*this, place_window); 453 if (!place_window)
454 moveResize(m_frame.x(), m_frame.y(), m_frame.width(), m_frame.height());
454 455
455 moveResize(m_frame.x(), m_frame.y(), m_frame.width(), m_frame.height()); 456 screen.getWorkspace(workspace_number)->addWindow(*this, place_window);
456 457
457 if (shaded) { // start shaded 458 if (shaded) { // start shaded
458 shaded = false; 459 shaded = false;
@@ -471,7 +472,6 @@ void FluxboxWindow::init() {
471 } 472 }
472 473
473 setState(current_state); 474 setState(current_state);
474 m_frame.resizeForClient(wattrib.width, wattrib.height);
475 m_frame.reconfigure(); 475 m_frame.reconfigure();
476 sendConfigureNotify(); 476 sendConfigureNotify();
477 // no focus default 477 // no focus default