minor fixes

This commit is contained in:
fluxgen 2004-06-07 21:22:42 +00:00
parent 9b494abdce
commit aaa72eada2

View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.279 2004/06/07 11:46:04 rathnor Exp $ // $Id: Screen.cc,v 1.280 2004/06/07 21:22:42 fluxgen Exp $
#include "Screen.hh" #include "Screen.hh"
@ -356,10 +356,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
m_current_workspace = m_workspaces_list.front(); m_current_workspace = m_workspaces_list.front();
#ifdef SLIT
m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()),
Fluxbox::instance()->getSlitlistFilename().c_str()));
#endif // SLIT
//!! TODO: we shouldn't do this more than once, but since slit handles their //!! TODO: we shouldn't do this more than once, but since slit handles their
// own resources we must do this. // own resources we must do this.
@ -389,6 +385,11 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
*resource.gc_cap_style, *resource.gc_cap_style,
*resource.gc_join_style); *resource.gc_join_style);
#ifdef SLIT
m_slit.reset(new Slit(*this, *layerManager().getLayer(Fluxbox::instance()->getDesktopLayer()),
Fluxbox::instance()->getSlitlistFilename().c_str()));
#endif // SLIT
rm.unlock(); rm.unlock();
XFlush(disp); XFlush(disp);
@ -750,7 +751,6 @@ void BScreen::removeClient(WinClient &client) {
if (cycling_window != focused_list.end()) if (cycling_window != focused_list.end())
cyc = *cycling_window; cyc = *cycling_window;
WinClient *focused = Fluxbox::instance()->getFocusedWindow();
focused_list.remove(&client); focused_list.remove(&client);
if (cyc == &client) { if (cyc == &client) {
cycling_window = focused_list.end(); cycling_window = focused_list.end();
@ -1793,7 +1793,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
#undef _BOOLITEM #undef _BOOLITEM
//!! TODO: antialias
FbTk::MenuItem *menu_alpha_item = new IntResMenuItem("Menu Alpha", resource.menu_alpha, FbTk::MenuItem *menu_alpha_item = new IntResMenuItem("Menu Alpha", resource.menu_alpha,
0, 255); 0, 255);
menu_alpha_item->setCommand(saverc_cmd); menu_alpha_item->setCommand(saverc_cmd);