aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-24 16:29:14 (GMT)
committerfluxgen <fluxgen>2003-06-24 16:29:14 (GMT)
commit2d0536a22380311e0668c0808dab95222af078c3 (patch)
treed6eac59392d73ad29f9cf47ed6e3d789e793f1f3
parentf58489b8e3206fe92618ddb45601259ed2b803a4 (diff)
downloadfluxbox-2d0536a22380311e0668c0808dab95222af078c3.zip
fluxbox-2d0536a22380311e0668c0808dab95222af078c3.tar.bz2
using slit themes border color, border width and bevel width
-rw-r--r--src/Slit.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index 0ebe3d5..5fdabdc 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.66 2003/06/24 13:48:34 fluxgen Exp $ 25// $Id: Slit.cc,v 1.67 2003/06/24 16:29:14 fluxgen Exp $
26 26
27#include "Slit.hh" 27#include "Slit.hh"
28 28
@@ -291,8 +291,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
291 unsigned long create_mask = CWBackPixmap | CWBackPixel | CWBorderPixel | 291 unsigned long create_mask = CWBackPixmap | CWBackPixel | CWBorderPixel |
292 CWColormap | CWOverrideRedirect | CWEventMask; 292 CWColormap | CWOverrideRedirect | CWEventMask;
293 attrib.background_pixmap = None; 293 attrib.background_pixmap = None;
294 attrib.background_pixel = attrib.border_pixel = 294 attrib.background_pixel = attrib.border_pixel = theme().borderColor().pixel();
295 screen().rootTheme().borderColor().pixel();
296 attrib.colormap = screen().rootWindow().colormap(); 295 attrib.colormap = screen().rootWindow().colormap();
297 attrib.override_redirect = True; 296 attrib.override_redirect = True;
298 attrib.event_mask = s_eventmask; 297 attrib.event_mask = s_eventmask;
@@ -302,7 +301,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
302 Display *disp = FbTk::App::instance()->display(); 301 Display *disp = FbTk::App::instance()->display();
303 frame.window = 302 frame.window =
304 XCreateWindow(disp, screen().rootWindow().window(), frame.x, frame.y, 303 XCreateWindow(disp, screen().rootWindow().window(), frame.x, frame.y,
305 frame.width, frame.height, screen().rootTheme().borderWidth(), 304 frame.width, frame.height, theme().borderWidth(),
306 screen().rootWindow().depth(), InputOutput, screen().rootWindow().visual(), 305 screen().rootWindow().depth(), InputOutput, screen().rootWindow().visual(),
307 create_mask, &attrib); 306 create_mask, &attrib);
308 307
@@ -631,7 +630,7 @@ void Slit::reconfigure() {
631 // Need to count windows because not all client list entries 630 // Need to count windows because not all client list entries
632 // actually correspond to mapped windows. 631 // actually correspond to mapped windows.
633 int num_windows = 0; 632 int num_windows = 0;
634 const int bevel_width = screen().rootTheme().bevelWidth(); 633 const int bevel_width = theme().bevelWidth();
635 // determine width or height increase 634 // determine width or height increase
636 bool height_inc = false; 635 bool height_inc = false;
637 switch (direction()) { 636 switch (direction()) {
@@ -677,8 +676,8 @@ void Slit::reconfigure() {
677 reposition(); 676 reposition();
678 Display *disp = FbTk::App::instance()->display(); 677 Display *disp = FbTk::App::instance()->display();
679 678
680 frame.window.setBorderWidth(screen().rootTheme().borderWidth()); 679 frame.window.setBorderWidth(theme().borderWidth());
681 frame.window.setBorderColor(screen().rootTheme().borderColor()); 680 frame.window.setBorderColor(theme().borderColor());
682 // did we actually use slit slots 681 // did we actually use slit slots
683 if (num_windows == 0) 682 if (num_windows == 0)
684 frame.window.hide(); 683 frame.window.hide();
@@ -806,8 +805,8 @@ void Slit::reposition() {
806 head_h = screen().height(); 805 head_h = screen().height();
807 } 806 }
808 807
809 int border_width = screen().rootTheme().borderWidth(); 808 int border_width = theme().borderWidth();
810 int bevel_width = screen().rootTheme().bevelWidth(); 809 int bevel_width = theme().bevelWidth();
811 810
812 // place the slit in the appropriate place 811 // place the slit in the appropriate place
813 switch (placement()) { 812 switch (placement()) {