aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-09-08 19:43:15 (GMT)
committerfluxgen <fluxgen>2002-09-08 19:43:15 (GMT)
commit1467457cdee0ca1622894e594560f48bfafd34d0 (patch)
tree431fea21a3f630c1434f07b752477d58aa5fdfc9
parent1cdc741cc43cf03de54959cb29d92a4e9c0649be (diff)
downloadfluxbox-1467457cdee0ca1622894e594560f48bfafd34d0.zip
fluxbox-1467457cdee0ca1622894e594560f48bfafd34d0.tar.bz2
new workspace window stacking
-rw-r--r--src/Tab.cc9
-rw-r--r--src/Toolbar.cc9
2 files changed, 11 insertions, 7 deletions
diff --git a/src/Tab.cc b/src/Tab.cc
index 57a6474..8752c14 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Tab.cc,v 1.31 2002/08/11 21:12:10 fluxgen Exp $ 22// $Id: Tab.cc,v 1.32 2002/09/08 19:41:59 fluxgen Exp $
23 23
24#include "Tab.hh" 24#include "Tab.hh"
25 25
@@ -155,8 +155,11 @@ void Tab::raise() {
155 //get first tab 155 //get first tab
156 Tab *tab = 0; 156 Tab *tab = 0;
157 //raise tabs 157 //raise tabs
158 for (tab = getFirst(this); tab!=0; tab = tab->m_next) 158 Workspace::Stack st;
159 m_win->getScreen()->raiseWindows(&tab->m_tabwin, 1); 159 for (tab = getFirst(this); tab!=0; tab = tab->m_next) {
160 st.push_back(tab->m_tabwin);
161 }
162 m_win->getScreen()->raiseWindows(st);
160} 163}
161 164
162//-------------- lower -------------------- 165//-------------- lower --------------------
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 6856397..81bb0ff 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.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: Toolbar.cc,v 1.30 2002/09/06 16:50:51 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.31 2002/09/08 19:43:15 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -1022,8 +1022,9 @@ void Toolbar::buttonPressEvent(XButtonEvent *be) {
1022 } 1022 }
1023#endif // HAVE_STRFTIME 1023#endif // HAVE_STRFTIME
1024 else if (! on_top) { 1024 else if (! on_top) {
1025 Window w[1] = { frame.window }; 1025 Workspace::Stack st;
1026 screen->raiseWindows(w, 1); 1026 st.push_back(frame.window);
1027 screen->raiseWindows(st);
1027 } 1028 }
1028 } else if (be->button == 2 && (! on_top)) { 1029 } else if (be->button == 2 && (! on_top)) {
1029 XLowerWindow(display, frame.window); 1030 XLowerWindow(display, frame.window);
@@ -1315,7 +1316,7 @@ void Toolbarmenu::itemSelected(int button, unsigned int index) {
1315 setItemSelected(1, change); 1316 setItemSelected(1, change);
1316 1317
1317 if (toolbar->isOnTop()) 1318 if (toolbar->isOnTop())
1318 toolbar->screen->raiseWindows((Window *) 0, 0); 1319 toolbar->screen->raiseWindows(Workspace::Stack());
1319 1320
1320 Fluxbox::instance()->save_rc(); 1321 Fluxbox::instance()->save_rc();
1321 break; 1322 break;