diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/deKoratorclient.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/client/deKoratorclient.cpp b/client/deKoratorclient.cpp index f5779a4..d47bcff 100644 --- a/client/deKoratorclient.cpp +++ b/client/deKoratorclient.cpp @@ -57,8 +57,8 @@ static int BOTTOMFRAMESIZE = 0; static int BOTTOMSHADEDFRAMESIZE = 0; static int RIGHTFRAMESIZE = 0; -static bool HASTOPFRAME = FALSE; -static bool HASBOTTOMSHADEDFRAME = FALSE; +static bool HASTOPFRAME = false; +static bool HASBOTTOMSHADEDFRAME = false; // deco static int LEFTTOPCORNERWIDTH; @@ -605,10 +605,8 @@ void DeKoratorFactory::loadPixmaps() bool optLeft = DECOARR[ topLeftFrame ][ orig ] ->load( decoPixDir + "/leftTopFrameBg.png" ); bool optMid = DECOARR[ topMidFrame ][ orig ] ->load( decoPixDir + "/midTopFrameBg.png" ); bool optRight = DECOARR[ topRightFrame ][ orig ] ->load( decoPixDir + "/rightTopFrameBg.png" ); - if ( ( optLeft == true ) && ( optMid == true ) && ( optRight == true ) ) - HASTOPFRAME = true; - else - HASTOPFRAME = false; + HASTOPFRAME = optLeft && optMid && optRight; + // title bar from left to right DECOARR[ leftTopCornerFrame ][ orig ] ->load( decoPixDir + "/topLeftCornerBg.png" ); DECOARR[ buttonsLeft ][ orig ] ->load( decoPixDir + "/leftButtonsBg.png" ); @@ -630,10 +628,8 @@ void DeKoratorFactory::loadPixmaps() optLeft = DECOARR[ bottomShadedLeftFrame ][ orig ] ->load( decoPixDir + "/leftBottomShadedFrameBg.png" ); optMid = DECOARR[ bottomShadedMidFrame ][ orig ] ->load( decoPixDir + "/midBottomShadedFrameBg.png" ); optRight = DECOARR[ bottomShadedRightFrame ][ orig ] ->load( decoPixDir + "/rightBottomShadedFrameBg.png" ); - if ( ( optLeft == true ) && ( optMid == true ) && ( optRight == true ) ) - HASBOTTOMSHADEDFRAME = true; - else - HASBOTTOMSHADEDFRAME = false; + HASBOTTOMSHADEDFRAME = optLeft && optMid && optRight; + // right frame from top to bottom DECOARR[ rightTopFrame ][ orig ] ->load( decoPixDir + "/topRightFrameBg.png" ); DECOARR[ rightMidFrame ][ orig ] ->load( decoPixDir + "/midRightFrameBg.png" ); @@ -2307,7 +2303,7 @@ KDecoration::Position DeKoratorClient::mousePosition( const TQPoint & point ) co // on left frame if ( HASTOPFRAME == true && point.y() <= TOPFRAMESIZE + TITLESIZE ) pos = PositionTopLeft; - else if ( HASTOPFRAME == FALSE && point.y() <= TITLESIZE ) + else if ( HASTOPFRAME == false && point.y() <= TITLESIZE ) pos = PositionTopLeft; else if ( point.y() >= ( height() - LEFTBOTTOMCORNERFRAMEHEIGHT - BOTTOMFRAMESIZE ) ) pos = PositionBottomLeft; |