aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-08-05 23:38:41 (GMT)
committermarkt <markt>2006-08-05 23:38:41 (GMT)
commit7b49c4a00bc8d0b9685868e5ad4699b8c5530ab9 (patch)
treef31349c2b5223d8c838bad873b861d875ae61956
parent721c02204a5f00e7f1c59983df0b1549fe1e971b (diff)
downloadfluxbox-7b49c4a00bc8d0b9685868e5ad4699b8c5530ab9.zip
fluxbox-7b49c4a00bc8d0b9685868e5ad4699b8c5530ab9.tar.bz2
don't call placement strategy on maximized or fullscreen windows
-rw-r--r--ChangeLog2
-rw-r--r--src/Window.cc6
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ec4ed05..a6acc44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/08/05: 3*06/08/05:
4 * Don't call placement strategy on maximized or fullscreen windows (Mark)
5 Window.cc
4 * Updated man fluxstyle (thanks Guillermo Patterer) 6 * Updated man fluxstyle (thanks Guillermo Patterer)
5 doc/asciidoc/fluxstyle.txt 7 doc/asciidoc/fluxstyle.txt
6*06/08/04: 8*06/08/04:
diff --git a/src/Window.cc b/src/Window.cc
index 1895b13..5aebad4 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -382,7 +382,9 @@ FluxboxWindow::~FluxboxWindow() {
382void FluxboxWindow::init() { 382void FluxboxWindow::init() {
383 m_attaching_tab = 0; 383 m_attaching_tab = 0;
384 // magic to detect if moved by hints 384 // magic to detect if moved by hints
385 m_old_pos_x = 0; 385 // don't use 0, since setting maximized or fullscreen on the window will set
386 // this to 0
387 m_old_pos_x = m_screen.width();
386 388
387 assert(m_client); 389 assert(m_client);
388 m_client->setFluxboxWindow(this); 390 m_client->setFluxboxWindow(this);
@@ -512,7 +514,7 @@ void FluxboxWindow::init() {
512 if (m_workspace_number < 0 || m_workspace_number >= screen().numberOfWorkspaces()) 514 if (m_workspace_number < 0 || m_workspace_number >= screen().numberOfWorkspaces())
513 m_workspace_number = screen().currentWorkspaceID(); 515 m_workspace_number = screen().currentWorkspaceID();
514 516
515 bool place_window = (m_old_pos_x == 0); 517 bool place_window = (m_old_pos_x == static_cast<signed>(m_screen.width()));
516 518
517 if (fluxbox.isStartup()) 519 if (fluxbox.isStartup())
518 place_window = false; 520 place_window = false;