fix Xmbfonts on multiple screens

and external tabs showing from different workspaces on placement change

3 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index d195bc0..2fc00a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 (Format: Year/Month/Day)
 Changes for 0.9.16:
+*06/04/05:
+   * Fix tabs on other workspaces being shown on placement change (Simon)
+     + Fix XmbFonts for multiple screens. Still need to fix XFontImp, 
+       it's quite a bit more convoluted.
+     FbWinFrame.cc FbTk/XmbFontImp.cc
 *06/04/04:
    * Rotated Xmb Fonts (Simon)
      - rotated when drawn. Probably not very efficient for 
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc
index f33942a..87eed8f 100644
--- a/src/FbTk/XmbFontImp.cc
+++ b/src/FbTk/XmbFontImp.cc
@@ -209,7 +209,6 @@ void XmbFontImp::drawText(const FbDrawable &d, int screen, GC main_gc, const cha
     }
 
     Display *dpy = App::instance()->display();
-    Window rootwin = DefaultRootWindow(dpy);
 
     int xpos = x, ypos = y;
     unsigned int w = d.width();
@@ -219,7 +218,7 @@ void XmbFontImp::drawText(const FbDrawable &d, int screen, GC main_gc, const cha
     untranslateCoords(orient, xpos, ypos, w, h);
 
     // not straight forward, we actually draw it elsewhere, then rotate it
-    FbTk::FbPixmap canvas(rootwin, w, h, 1);
+    FbTk::FbPixmap canvas(d.drawable(), w, h, 1);
  
     // create graphic context for our canvas
     FbTk::GContext font_gc(canvas);
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 18bae9a..bb2018b 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -412,9 +412,8 @@ void FbWinFrame::alignTabs() {
         if (m_visible && m_use_tabs) {
             applyTabContainer();
             m_tab_container.clear();
-        }
-        if (m_use_tabs)
             m_tab_container.show();
+        }
     }
 
     if (m_tab_container.parent()->window() != m_screen.rootWindow().window()) {