diff options
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index 18c21f4..b8ff368 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -48,10 +48,6 @@ | |||
48 | #include "RootTheme.hh" | 48 | #include "RootTheme.hh" |
49 | #include "FbMenu.hh" | 49 | #include "FbMenu.hh" |
50 | 50 | ||
51 | #ifdef XINERAMA | ||
52 | #include "Xinerama.hh" | ||
53 | #endif // XINERAMA | ||
54 | |||
55 | #include "SlitTheme.hh" | 51 | #include "SlitTheme.hh" |
56 | #include "SlitClient.hh" | 52 | #include "SlitClient.hh" |
57 | #include "Xutil.hh" | 53 | #include "Xutil.hh" |
@@ -270,6 +266,9 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename) | |||
270 | m_slitmenu(scr.menuTheme(), | 266 | m_slitmenu(scr.menuTheme(), |
271 | scr.imageControl(), | 267 | scr.imageControl(), |
272 | *scr.layerManager().getLayer(Layer::MENU)), | 268 | *scr.layerManager().getLayer(Layer::MENU)), |
269 | #ifdef XINERAMA | ||
270 | m_xineramaheadmenu(0), | ||
271 | #endif // XINERAMA | ||
273 | frame(scr.rootWindow()), | 272 | frame(scr.rootWindow()), |
274 | //For KDE dock applets | 273 | //For KDE dock applets |
275 | m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(), | 274 | m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(), |
@@ -1113,6 +1112,10 @@ void Slit::exposeEvent(XExposeEvent &ev) { | |||
1113 | 1112 | ||
1114 | void Slit::update(FbTk::Subject *subj) { | 1113 | void Slit::update(FbTk::Subject *subj) { |
1115 | reconfigure(); | 1114 | reconfigure(); |
1115 | #ifdef XINERAMA | ||
1116 | if (subj == &m_screen.resizeSig() && m_xineramaheadmenu) | ||
1117 | m_xineramaheadmenu->reloadHeads(); | ||
1118 | #endif // XINERAMA | ||
1116 | } | 1119 | } |
1117 | 1120 | ||
1118 | void Slit::clearWindow() { | 1121 | void Slit::clearWindow() { |
@@ -1254,6 +1257,7 @@ void Slit::setupMenu() { | |||
1254 | #ifdef XINERAMA | 1257 | #ifdef XINERAMA |
1255 | if (screen().hasXinerama()) { | 1258 | if (screen().hasXinerama()) { |
1256 | m_slitmenu.insert(_FB_XTEXT(Menu, OnHead, "On Head...", "Title of On Head menu"), | 1259 | m_slitmenu.insert(_FB_XTEXT(Menu, OnHead, "On Head...", "Title of On Head menu"), |
1260 | m_xineramaheadmenu = | ||
1257 | new XineramaHeadMenu<Slit>( | 1261 | new XineramaHeadMenu<Slit>( |
1258 | screen().menuTheme(), | 1262 | screen().menuTheme(), |
1259 | screen(), | 1263 | screen(), |