aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-04-05 03:48:16 (GMT)
committersimonb <simonb>2006-04-05 03:48:16 (GMT)
commit0497afae19f49050f4a11716d79d3d01e869e4d3 (patch)
tree9b356c3ace86c3f32dfc51ed690e675e5ddf44bc
parent42719701dc17b5acef41223fe0237b9154cb3f0a (diff)
downloadfluxbox-0497afae19f49050f4a11716d79d3d01e869e4d3.zip
fluxbox-0497afae19f49050f4a11716d79d3d01e869e4d3.tar.bz2
fix Xmbfonts on multiple screens
and external tabs showing from different workspaces on placement change
-rw-r--r--ChangeLog5
-rw-r--r--src/FbTk/XmbFontImp.cc3
-rw-r--r--src/FbWinFrame.cc3
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 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/04/05:
4 * Fix tabs on other workspaces being shown on placement change (Simon)
5 + Fix XmbFonts for multiple screens. Still need to fix XFontImp,
6 it's quite a bit more convoluted.
7 FbWinFrame.cc FbTk/XmbFontImp.cc
3*06/04/04: 8*06/04/04:
4 * Rotated Xmb Fonts (Simon) 9 * Rotated Xmb Fonts (Simon)
5 - rotated when drawn. Probably not very efficient for 10 - 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
209 } 209 }
210 210
211 Display *dpy = App::instance()->display(); 211 Display *dpy = App::instance()->display();
212 Window rootwin = DefaultRootWindow(dpy);
213 212
214 int xpos = x, ypos = y; 213 int xpos = x, ypos = y;
215 unsigned int w = d.width(); 214 unsigned int w = d.width();
@@ -219,7 +218,7 @@ void XmbFontImp::drawText(const FbDrawable &d, int screen, GC main_gc, const cha
219 untranslateCoords(orient, xpos, ypos, w, h); 218 untranslateCoords(orient, xpos, ypos, w, h);
220 219
221 // not straight forward, we actually draw it elsewhere, then rotate it 220 // not straight forward, we actually draw it elsewhere, then rotate it
222 FbTk::FbPixmap canvas(rootwin, w, h, 1); 221 FbTk::FbPixmap canvas(d.drawable(), w, h, 1);
223 222
224 // create graphic context for our canvas 223 // create graphic context for our canvas
225 FbTk::GContext font_gc(canvas); 224 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() {
412 if (m_visible && m_use_tabs) { 412 if (m_visible && m_use_tabs) {
413 applyTabContainer(); 413 applyTabContainer();
414 m_tab_container.clear(); 414 m_tab_container.clear();
415 }
416 if (m_use_tabs)
417 m_tab_container.show(); 415 m_tab_container.show();
416 }
418 } 417 }
419 418
420 if (m_tab_container.parent()->window() != m_screen.rootWindow().window()) { 419 if (m_tab_container.parent()->window() != m_screen.rootWindow().window()) {