aboutsummaryrefslogtreecommitdiff
path: root/src/Slit.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-01-05 01:39:19 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-01-05 01:39:19 (GMT)
commitac1bd7e0981222bf340ce7defb2bb8307d42a0a2 (patch)
treec8fb9c618184e7ac44f6138409cab3fab86b23e4 /src/Slit.cc
parent60ba709c2f47cc2c7b877aef1b0f297b097853e5 (diff)
downloadfluxbox-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.zip
fluxbox-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.tar.bz2
update code to use ThemeProxy
Diffstat (limited to 'src/Slit.cc')
-rw-r--r--src/Slit.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index fcbfe62..b412eec 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -304,7 +304,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
304 _FB_USES_NLS; 304 _FB_USES_NLS;
305 305
306 // attach to theme and root window change signal 306 // attach to theme and root window change signal
307 m_slit_theme->reconfigSig().attach(this); 307 theme().reconfigSig().attach(this);
308 scr.resizeSig().attach(this); 308 scr.resizeSig().attach(this);
309 scr.bgChangeSig().attach(this); 309 scr.bgChangeSig().attach(this);
310 scr.reconfigureSig().attach(this); // if alpha changed (we disablethis signal when we get theme change sig) 310 scr.reconfigureSig().attach(this); // if alpha changed (we disablethis signal when we get theme change sig)
@@ -634,7 +634,7 @@ void Slit::reconfigure() {
634 // Need to count windows because not all client list entries 634 // Need to count windows because not all client list entries
635 // actually correspond to mapped windows. 635 // actually correspond to mapped windows.
636 int num_windows = 0; 636 int num_windows = 0;
637 const int bevel_width = theme().bevelWidth(); 637 const int bevel_width = theme()->bevelWidth();
638 // determine width or height increase 638 // determine width or height increase
639 bool height_inc = false; 639 bool height_inc = false;
640 switch (direction()) { 640 switch (direction()) {
@@ -686,8 +686,8 @@ void Slit::reconfigure() {
686 686
687 Display *disp = FbTk::App::instance()->display(); 687 Display *disp = FbTk::App::instance()->display();
688 688
689 frame.window.setBorderWidth(theme().borderWidth()); 689 frame.window.setBorderWidth(theme()->borderWidth());
690 frame.window.setBorderColor(theme().borderColor()); 690 frame.window.setBorderColor(theme()->borderColor());
691 691
692 Pixmap tmp = frame.pixmap; 692 Pixmap tmp = frame.pixmap;
693 FbTk::ImageControl &image_ctrl = screen().imageControl(); 693 FbTk::ImageControl &image_ctrl = screen().imageControl();
@@ -817,8 +817,8 @@ void Slit::reposition() {
817 head_h = screen().height(); 817 head_h = screen().height();
818 } 818 }
819 819
820 int border_width = theme().borderWidth(); 820 int border_width = theme()->borderWidth();
821 int bevel_width = theme().bevelWidth(); 821 int bevel_width = theme()->bevelWidth();
822 // make sure at leaste one pixel is visible 822 // make sure at leaste one pixel is visible
823 if (border_width >= bevel_width) 823 if (border_width >= bevel_width)
824 bevel_width = border_width + 1; 824 bevel_width = border_width + 1;