nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed some useless code

Browse source
This commit is contained in:
markt 2007-03-10 18:06:09 +00:00
parent 4ed76f99b6
commit 61cf82771a
4 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/RootTheme.cc
View file

@ -142,9 +142,8 @@ private:
}; };
RootTheme::RootTheme(FbTk::ImageControl &image_control, BScreen *scrn): RootTheme::RootTheme(FbTk::ImageControl &image_control):
FbTk::Theme(image_control.screenNumber()), FbTk::Theme(image_control.screenNumber()),
m_screen(scrn),
m_background(new BackgroundItem(*this, "background", "Background")), m_background(new BackgroundItem(*this, "background", "Background")),
m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())), m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())),
m_image_ctrl(image_control) { m_image_ctrl(image_control) {
@ -184,7 +183,7 @@ void RootTheme::reconfigTheme() {
return; return;
} }
if (!m_background->changed() || !m_screen) if (!m_background->changed())
return; return;
// style doesn't wish to change the background // style doesn't wish to change the background
@ -195,9 +194,6 @@ void RootTheme::reconfigTheme() {
// Else parse background from style // Else parse background from style
// //
// root window helper
FbRootWindow &rootwin = m_screen->rootWindow();
m_background->setApplied(); m_background->setApplied();
// handle background option in style // handle background option in style
@ -264,6 +260,4 @@ void RootTheme::reconfigTheme() {
exec.execute(); exec.execute();
} }
rootwin.clear();
} }

3
src/RootTheme.hh
View file

@ -46,7 +46,7 @@ public:
/// constructor /// constructor
/// @param resmanager resource manager for finding specific resources /// @param resmanager resource manager for finding specific resources
/// @param image_control for rendering background texture /// @param image_control for rendering background texture
RootTheme(FbTk::ImageControl &image_control, BScreen *scrn = 0); RootTheme(FbTk::ImageControl &image_control);
~RootTheme(); ~RootTheme();
bool fallback(FbTk::ThemeItem_base &item); bool fallback(FbTk::ThemeItem_base &item);
@ -62,7 +62,6 @@ public:
} }
private: private:
BScreen *m_screen;
BackgroundItem *m_background;///< background image/texture BackgroundItem *m_background;///< background image/texture
FbTk::GContext m_opgc; FbTk::GContext m_opgc;
FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture

2
src/Screen.cc
View file

@ -439,7 +439,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
cmd.execute(); cmd.execute();
} }
m_root_theme.reset(new RootTheme(imageControl(), this)); m_root_theme.reset(new RootTheme(imageControl()));
m_root_theme->reconfigTheme(); m_root_theme->reconfigTheme();
m_windowtheme->setFocusedAlpha(*resource.focused_alpha); m_windowtheme->setFocusedAlpha(*resource.focused_alpha);

3
src/Window.hh
View file

@ -198,8 +198,7 @@ public:
// map this window // map this window
void show(); void show();
// unmap this window // unmap this window
void hide() { hide(true); } void hide(bool interrupt_moving = true);
void hide(bool interrupt_moving);
void iconify(); void iconify();
void deiconify(bool reassoc = true, bool do_raise = true); void deiconify(bool reassoc = true, bool do_raise = true);