aboutsummaryrefslogtreecommitdiff
path: root/src/Slit.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-15 23:30:07 (GMT)
committerfluxgen <fluxgen>2003-05-15 23:30:07 (GMT)
commit5bbc7662328c2f147ceec0b7e6c3367cfd0b7a5f (patch)
treed016e4843c109352b3df01fc98780052a13fb7c2 /src/Slit.cc
parent988392b1eb89deaddfddfcb37a15e8f55d58bb70 (diff)
downloadfluxbox_pavel-5bbc7662328c2f147ceec0b7e6c3367cfd0b7a5f.zip
fluxbox_pavel-5bbc7662328c2f147ceec0b7e6c3367cfd0b7a5f.tar.bz2
minor cleaning
Diffstat (limited to 'src/Slit.cc')
-rw-r--r--src/Slit.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index bcd59b3..4664e62 100644
--- a/src/Slit.cc
+++ b/src/Slit.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: Slit.cc,v 1.53 2003/05/15 12:00:45 fluxgen Exp $ 25// $Id: Slit.cc,v 1.54 2003/05/15 23:30:06 fluxgen Exp $
26 26
27#include "Slit.hh" 27#include "Slit.hh"
28 28
@@ -264,22 +264,22 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
264 : m_screen(scr), m_timer(this), 264 : m_screen(scr), m_timer(this),
265 m_slitmenu(*scr.menuTheme(), 265 m_slitmenu(*scr.menuTheme(),
266 scr.screenNumber(), 266 scr.screenNumber(),
267 *scr.getImageControl(), 267 scr.imageControl(),
268 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), 268 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
269 m_placement_menu(*scr.menuTheme(), 269 m_placement_menu(*scr.menuTheme(),
270 scr.screenNumber(), 270 scr.screenNumber(),
271 *scr.getImageControl(), 271 scr.imageControl(),
272 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), 272 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
273 m_clientlist_menu(*scr.menuTheme(), 273 m_clientlist_menu(*scr.menuTheme(),
274 scr.screenNumber(), 274 scr.screenNumber(),
275 *scr.getImageControl(), 275 scr.imageControl(),
276 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), 276 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
277 m_layermenu(new LayerMenu<Slit>(*scr.menuTheme(), 277 m_layermenu(new LayerMenu<Slit>(*scr.menuTheme(),
278 scr.screenNumber(), 278 scr.screenNumber(),
279 *scr.getImageControl(), 279 scr.imageControl(),
280 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), 280 *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()),
281 this, 281 this,
282 true)), 282 true)),
283 //For KDE dock applets 283 //For KDE dock applets
284 m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(), 284 m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(),
285 "KWM_DOCKWINDOW", False)), //KDE v1.x 285 "KWM_DOCKWINDOW", False)), //KDE v1.x
@@ -337,7 +337,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
337 337
338Slit::~Slit() { 338Slit::~Slit() {
339 if (frame.pixmap != 0) 339 if (frame.pixmap != 0)
340 screen().getImageControl()->removeImage(frame.pixmap); 340 screen().imageControl().removeImage(frame.pixmap);
341} 341}
342 342
343 343
@@ -643,14 +643,14 @@ void Slit::reconfigure() {
643 frame.window.show(); 643 frame.window.show();
644 644
645 Pixmap tmp = frame.pixmap; 645 Pixmap tmp = frame.pixmap;
646 FbTk::ImageControl *image_ctrl = screen().getImageControl(); 646 FbTk::ImageControl &image_ctrl = screen().imageControl();
647 const FbTk::Texture &texture = m_slit_theme->texture(); 647 const FbTk::Texture &texture = m_slit_theme->texture();
648 if (texture.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID) && 648 if (texture.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID) &&
649 texture.pixmap().drawable() == 0) { 649 texture.pixmap().drawable() == 0) {
650 frame.pixmap = None; 650 frame.pixmap = None;
651 frame.window.setBackgroundColor(texture.color()); 651 frame.window.setBackgroundColor(texture.color());
652 } else { 652 } else {
653 frame.pixmap = image_ctrl->renderImage(frame.width, frame.height, 653 frame.pixmap = image_ctrl.renderImage(frame.width, frame.height,
654 texture); 654 texture);
655 if (frame.pixmap == 0) 655 if (frame.pixmap == 0)
656 frame.window.setBackgroundColor(texture.color()); 656 frame.window.setBackgroundColor(texture.color());
@@ -659,7 +659,7 @@ void Slit::reconfigure() {
659 } 659 }
660 660
661 if (tmp) 661 if (tmp)
662 image_ctrl->removeImage(tmp); 662 image_ctrl.removeImage(tmp);
663 663
664 clearWindow(); 664 clearWindow();
665 int x, y; 665 int x, y;