summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/Window.cc10
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a43f8b0..b5fdc78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/12/18: 3*07/12/18:
4 * Open transient windows on same workspace as parent (thanks Sascha Hunold)
5 Window.cc
4 * Holding control while clicking on a menu item will now keep the menu open (Mark) 6 * Holding control while clicking on a menu item will now keep the menu open (Mark)
5 FbTk/Menu.cc MenuItem.cc/hh 7 FbTk/Menu.cc MenuItem.cc/hh
6*07/12/17: 8*07/12/17:
diff --git a/src/Window.cc b/src/Window.cc
index 65afd67..801a97c 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -498,6 +498,16 @@ void FluxboxWindow::init() {
498 layerItem().setLayer(m_client->transientFor()->fbwindow()->layerItem().getLayer()); 498 layerItem().setLayer(m_client->transientFor()->fbwindow()->layerItem().getLayer());
499 else // if no parent then set default layer 499 else // if no parent then set default layer
500 moveToLayer(m_layernum, m_layernum != ::Layer::NORMAL); 500 moveToLayer(m_layernum, m_layernum != ::Layer::NORMAL);
501
502 // transients should be on the same workspace as parent
503 if (m_client->isTransient() &&
504 m_client->transientFor()->fbwindow() &&
505 m_client->transientFor()->fbwindow() != this) {
506 m_workspace_number =
507 m_client->transientFor()->fbwindow()->workspaceNumber();
508 }
509
510
501#ifdef DEBUG 511#ifdef DEBUG
502 cerr<<"FluxboxWindow::init("<<title()<<") transientFor: "<< 512 cerr<<"FluxboxWindow::init("<<title()<<") transientFor: "<<
503 m_client->transientFor()<<endl; 513 m_client->transientFor()<<endl;