diff options
author | fluxgen <fluxgen> | 2004-06-07 21:22:42 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2004-06-07 21:22:42 (GMT) |
commit | aaa72eada26a8e63ea685d940332bf2fd4795df8 (patch) | |
tree | 1046c13f0384e705dc33f8cd8faa7f40d5ae25b6 | |
parent | 9b494abdcee52dbfe9c05b9be0353b9d3e27766d (diff) | |
download | fluxbox-aaa72eada26a8e63ea685d940332bf2fd4795df8.zip fluxbox-aaa72eada26a8e63ea685d940332bf2fd4795df8.tar.bz2 |
minor fixes
-rw-r--r-- | src/Screen.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 3fce3a6..1d08fab 100644 --- a/src/Screen.cc +++ b/src/Screen.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: Screen.cc,v 1.279 2004/06/07 11:46:04 rathnor Exp $ | 25 | // $Id: Screen.cc,v 1.280 2004/06/07 21:22:42 fluxgen Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -356,10 +356,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
356 | 356 | ||
357 | m_current_workspace = m_workspaces_list.front(); | 357 | m_current_workspace = m_workspaces_list.front(); |
358 | 358 | ||
359 | #ifdef SLIT | ||
360 | m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()), | ||
361 | Fluxbox::instance()->getSlitlistFilename().c_str())); | ||
362 | #endif // SLIT | ||
363 | 359 | ||
364 | //!! TODO: we shouldn't do this more than once, but since slit handles their | 360 | //!! TODO: we shouldn't do this more than once, but since slit handles their |
365 | // own resources we must do this. | 361 | // own resources we must do this. |
@@ -389,6 +385,11 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
389 | *resource.gc_cap_style, | 385 | *resource.gc_cap_style, |
390 | *resource.gc_join_style); | 386 | *resource.gc_join_style); |
391 | 387 | ||
388 | #ifdef SLIT | ||
389 | m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()), | ||
390 | Fluxbox::instance()->getSlitlistFilename().c_str())); | ||
391 | #endif // SLIT | ||
392 | |||
392 | rm.unlock(); | 393 | rm.unlock(); |
393 | 394 | ||
394 | XFlush(disp); | 395 | XFlush(disp); |
@@ -750,7 +751,6 @@ void BScreen::removeClient(WinClient &client) { | |||
750 | if (cycling_window != focused_list.end()) | 751 | if (cycling_window != focused_list.end()) |
751 | cyc = *cycling_window; | 752 | cyc = *cycling_window; |
752 | 753 | ||
753 | WinClient *focused = Fluxbox::instance()->getFocusedWindow(); | ||
754 | focused_list.remove(&client); | 754 | focused_list.remove(&client); |
755 | if (cyc == &client) { | 755 | if (cyc == &client) { |
756 | cycling_window = focused_list.end(); | 756 | cycling_window = focused_list.end(); |
@@ -1793,7 +1793,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) { | |||
1793 | 1793 | ||
1794 | #undef _BOOLITEM | 1794 | #undef _BOOLITEM |
1795 | 1795 | ||
1796 | //!! TODO: antialias | ||
1797 | FbTk::MenuItem *menu_alpha_item = new IntResMenuItem("Menu Alpha", resource.menu_alpha, | 1796 | FbTk::MenuItem *menu_alpha_item = new IntResMenuItem("Menu Alpha", resource.menu_alpha, |
1798 | 0, 255); | 1797 | 0, 255); |
1799 | menu_alpha_item->setCommand(saverc_cmd); | 1798 | menu_alpha_item->setCommand(saverc_cmd); |