summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/deKoratorclient.cpp88
-rw-r--r--client/deKoratorclient.h12
2 files changed, 50 insertions, 50 deletions
diff --git a/client/deKoratorclient.cpp b/client/deKoratorclient.cpp
index d47bcff..4dd1834 100644
--- a/client/deKoratorclient.cpp
+++ b/client/deKoratorclient.cpp
@@ -61,14 +61,14 @@ static bool HASTOPFRAME = false;
static bool HASBOTTOMSHADEDFRAME = false;
// deco
-static int LEFTTOPCORNERWIDTH;
-static int RIGHTTOPCORNERWIDTH;
+static int LEFTUPPERCORNERWIDTH;
+static int RIGHTUPPERCORNERWIDTH;
static int TITLELEFTWIDTH;
static int TITLERIGHTWIDTH;
-static int LEFTTOPFRAMEHEIGHT;
-static int LEFTBOTTOMCORNERFRAMEHEIGHT;
-static int RIGHTTOPFRAMEHEIGHT;
-static int RIGHTBOTTOMCORNERFRAMEHEIGTH;
+static int LEFTUPPERFRAMEHEIGHT;
+static int LEFTLOWERCORNERFRAMEHEIGHT;
+static int RIGHTUPPERFRAMEHEIGHT;
+static int RIGHTLOWERCORNERFRAMEHEIGTH;
static int BOTTOMLEFTFRAMEWIDTH;
static int BOTTOMRIGHTFRAMEWIDTH;
static int BOTTOMSHADEDLEFTFRAMEWIDTH;
@@ -608,17 +608,17 @@ void DeKoratorFactory::loadPixmaps()
HASTOPFRAME = optLeft && optMid && optRight;
// title bar from left to right
- DECOARR[ leftTopCornerFrame ][ orig ] ->load( decoPixDir + "/topLeftCornerBg.png" );
+ DECOARR[ leftUpperCornerFrame ][ orig ] ->load( decoPixDir + "/topLeftCornerBg.png" );
DECOARR[ buttonsLeft ][ orig ] ->load( decoPixDir + "/leftButtonsBg.png" );
DECOARR[ titleLeft ][ orig ] ->load( decoPixDir + "/leftTitleBg.png" );
DECOARR[ titleMid ][ orig ] ->load( decoPixDir + "/midTitleBg.png" );
DECOARR[ titleRight ][ orig ] ->load( decoPixDir + "/rightTitleBg.png" );
DECOARR[ buttonsRight ][ orig ] ->load( decoPixDir + "/rightButtonsBg.png" );
- DECOARR[ rightTopCornerFrame ][ orig ] ->load( decoPixDir + "/topRightCornerBg.png" );
+ DECOARR[ rightUpperCornerFrame ][ orig ] ->load( decoPixDir + "/topRightCornerBg.png" );
// left frame from top to bottom
- DECOARR[ leftTopFrame ][ orig ] ->load( decoPixDir + "/topLeftFrameBg.png" );
+ DECOARR[ leftUpperFrame ][ orig ] ->load( decoPixDir + "/topLeftFrameBg.png" );
DECOARR[ leftMidFrame ][ orig ] ->load( decoPixDir + "/midLeftFrameBg.png" );
- DECOARR[ leftBottomCornerFrame ][ orig ] ->load( decoPixDir + "/bottomLeftFrameBg.png" );
+ DECOARR[ leftLowerCornerFrame ][ orig ] ->load( decoPixDir + "/bottomLeftFrameBg.png" );
// bottom frame from left to right
DECOARR[ bottomLeftFrame ][ orig ] ->load( decoPixDir + "/leftBottomFrameBg.png" );
DECOARR[ bottomMidFrame ][ orig ] ->load( decoPixDir + "/midBottomFrameBg.png" );
@@ -631,9 +631,9 @@ void DeKoratorFactory::loadPixmaps()
HASBOTTOMSHADEDFRAME = optLeft && optMid && optRight;
// right frame from top to bottom
- DECOARR[ rightTopFrame ][ orig ] ->load( decoPixDir + "/topRightFrameBg.png" );
+ DECOARR[ rightUpperFrame ][ orig ] ->load( decoPixDir + "/topRightFrameBg.png" );
DECOARR[ rightMidFrame ][ orig ] ->load( decoPixDir + "/midRightFrameBg.png" );
- DECOARR[ rightBottomCornerFrame ][ orig ] ->load( decoPixDir + "/bottomRightFrameBg.png" );
+ DECOARR[ rightLowerCornerFrame ][ orig ] ->load( decoPixDir + "/bottomRightFrameBg.png" );
// buttons
@@ -727,14 +727,14 @@ void DeKoratorFactory::determineSizes()
BOTTOMSHADEDFRAMESIZE = DECOARR[ bottomShadedMidFrame ][ orig ] ->height();
RIGHTFRAMESIZE = DECOARR[ rightMidFrame ][ orig ] ->width();
- LEFTTOPCORNERWIDTH = DECOARR[ leftTopCornerFrame ][ orig ] ->width();
- RIGHTTOPCORNERWIDTH = DECOARR[ rightTopCornerFrame ][ orig ] ->width();
+ LEFTUPPERCORNERWIDTH = DECOARR[ leftUpperCornerFrame ][ orig ] ->width();
+ RIGHTUPPERCORNERWIDTH = DECOARR[ rightUpperCornerFrame ][ orig ] ->width();
TITLELEFTWIDTH = DECOARR[ titleLeft ][ orig ] ->width();
TITLERIGHTWIDTH = DECOARR[ titleRight ][ orig ] ->width();
- LEFTTOPFRAMEHEIGHT = DECOARR[ leftTopFrame ][ orig ] ->height();
- LEFTBOTTOMCORNERFRAMEHEIGHT = DECOARR[ leftBottomCornerFrame ][ orig ] ->height();
- RIGHTTOPFRAMEHEIGHT = DECOARR[ rightTopFrame ][ orig ] ->height();
- RIGHTBOTTOMCORNERFRAMEHEIGTH = DECOARR[ rightBottomCornerFrame ][ orig ] ->height();
+ LEFTUPPERFRAMEHEIGHT = DECOARR[ leftUpperFrame ][ orig ] ->height();
+ LEFTLOWERCORNERFRAMEHEIGHT = DECOARR[ leftLowerCornerFrame ][ orig ] ->height();
+ RIGHTUPPERFRAMEHEIGHT = DECOARR[ rightUpperFrame ][ orig ] ->height();
+ RIGHTLOWERCORNERFRAMEHEIGTH = DECOARR[ rightLowerCornerFrame ][ orig ] ->height();
BOTTOMLEFTFRAMEWIDTH = DECOARR[ bottomLeftFrame ][ orig ] ->width();
BOTTOMRIGHTFRAMEWIDTH = DECOARR[ bottomRightFrame ][ orig ] ->width();
BOTTOMSHADEDLEFTFRAMEWIDTH = DECOARR[ bottomShadedLeftFrame ][ orig ] ->width();
@@ -1753,11 +1753,11 @@ void DeKoratorClient::init()
// spacers
topSpacer_ = new TQSpacerItem( 1, TOPFRAMESIZE,
TQSizePolicy::Expanding, TQSizePolicy::Fixed );
- leftTitleBarSpacer_ = new TQSpacerItem( LEFTTOPCORNERWIDTH, TITLESIZE,
+ leftTitleBarSpacer_ = new TQSpacerItem( LEFTUPPERCORNERWIDTH, TITLESIZE,
TQSizePolicy::Fixed, TQSizePolicy::Fixed );
titleBarSpacer_ = new TQSpacerItem( 1, TITLESIZE, TQSizePolicy::Expanding,
TQSizePolicy::Fixed );
- rightTitleBarSpacer_ = new TQSpacerItem( RIGHTTOPCORNERWIDTH, TITLESIZE,
+ rightTitleBarSpacer_ = new TQSpacerItem( RIGHTUPPERCORNERWIDTH, TITLESIZE,
TQSizePolicy::Fixed, TQSizePolicy::Fixed );
leftSpacer_ = new TQSpacerItem( LEFTFRAMESIZE, 1,
TQSizePolicy::Fixed, TQSizePolicy::Expanding );
@@ -2249,7 +2249,7 @@ void DeKoratorClient::resize( const TQSize & size )
TQSize DeKoratorClient::minimumSize() const
{
TQSize size = widget() ->minimumSize();
- size.setWidth( size.width() + LEFTTOPCORNERWIDTH + RIGHTTOPCORNERWIDTH );
+ size.setWidth( size.width() + LEFTUPPERCORNERWIDTH + RIGHTUPPERCORNERWIDTH );
return size;
@@ -2305,7 +2305,7 @@ KDecoration::Position DeKoratorClient::mousePosition( const TQPoint & point ) co
pos = PositionTopLeft;
else if ( HASTOPFRAME == false && point.y() <= TITLESIZE )
pos = PositionTopLeft;
- else if ( point.y() >= ( height() - LEFTBOTTOMCORNERFRAMEHEIGHT - BOTTOMFRAMESIZE ) )
+ else if ( point.y() >= ( height() - LEFTLOWERCORNERFRAMEHEIGHT - BOTTOMFRAMESIZE ) )
pos = PositionBottomLeft;
else
pos = PositionLeft;
@@ -2317,7 +2317,7 @@ KDecoration::Position DeKoratorClient::mousePosition( const TQPoint & point ) co
pos = PositionTopRight;
else if ( HASTOPFRAME == false && point.y() <= TITLESIZE )
pos = PositionTopRight;
- else if ( point.y() >= ( height() - RIGHTBOTTOMCORNERFRAMEHEIGTH - BOTTOMFRAMESIZE ) )
+ else if ( point.y() >= ( height() - RIGHTLOWERCORNERFRAMEHEIGTH - BOTTOMFRAMESIZE ) )
pos = PositionBottomRight;
else
pos = PositionRight;
@@ -2507,10 +2507,10 @@ void DeKoratorClient::paintEvent( TQPaintEvent* )
// leftTopCorner
- rect.setRect( 0, TOPFRAMESIZE, LEFTTOPCORNERWIDTH, TITLESIZE );
- painter2.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ leftTopCornerFrame ] ) : *( DECOPIXINACTARR[ leftTopCornerFrame ] ) );
+ rect.setRect( 0, TOPFRAMESIZE, LEFTUPPERCORNERWIDTH, TITLESIZE );
+ painter2.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ leftUpperCornerFrame ] ) : *( DECOPIXINACTARR[ leftUpperCornerFrame ] ) );
- // rect.setRect( 0, 0, LEFTTOPCORNERWIDTH, TITLESIZE );
+ // rect.setRect( 0, 0, LEFTUPPERCORNERWIDTH, TITLESIZE );
// painter2.drawTiledPixmap( rect, isActive() ? decoFactory_->topLeftCornerBg_ : decoFactory_->topLeftCornerBgInAct_ );
// Space under the left button group
@@ -2556,9 +2556,9 @@ void DeKoratorClient::paintEvent( TQPaintEvent* )
//topRightCorner
- rect.setRect( widget() ->width() - RIGHTTOPCORNERWIDTH, TOPFRAMESIZE, RIGHTTOPCORNERWIDTH, TITLESIZE );
+ rect.setRect( widget() ->width() - RIGHTUPPERCORNERWIDTH, TOPFRAMESIZE, RIGHTUPPERCORNERWIDTH, TITLESIZE );
- painter2.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ rightTopCornerFrame ] ) : *( DECOPIXINACTARR[ rightTopCornerFrame ] ) );
+ painter2.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ rightUpperCornerFrame ] ) : *( DECOPIXINACTARR[ rightUpperCornerFrame ] ) );
// painter2.drawTiledPixmap( rect, isActive() ? decoFactory_->topRightCornerBg_ : decoFactory_->topRightCornerBgInAct_ );
@@ -2618,14 +2618,14 @@ void DeKoratorClient::paintEvent( TQPaintEvent* )
//left frame
//top
- rect.setRect( 0, topOffset , LEFTFRAMESIZE, TQMIN( LEFTTOPFRAMEHEIGHT, leftRightFramesHeight ) );
+ rect.setRect( 0, topOffset , LEFTFRAMESIZE, TQMIN( LEFTUPPERFRAMEHEIGHT, leftRightFramesHeight ) );
- painter.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ leftTopFrame ] ) : *( DECOPIXINACTARR[ leftTopFrame ] ) );
+ painter.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ leftUpperFrame ] ) : *( DECOPIXINACTARR[ leftUpperFrame ] ) );
// mid
- if ( leftRightFramesHeight > LEFTTOPFRAMEHEIGHT + LEFTBOTTOMCORNERFRAMEHEIGHT )
+ if ( leftRightFramesHeight > LEFTUPPERFRAMEHEIGHT + LEFTLOWERCORNERFRAMEHEIGHT )
{
- rect.setRect( 0, topOffset + LEFTTOPFRAMEHEIGHT , LEFTFRAMESIZE, leftRightFramesHeight - LEFTTOPFRAMEHEIGHT - LEFTBOTTOMCORNERFRAMEHEIGHT );
+ rect.setRect( 0, topOffset + LEFTUPPERFRAMEHEIGHT , LEFTFRAMESIZE, leftRightFramesHeight - LEFTUPPERFRAMEHEIGHT - LEFTLOWERCORNERFRAMEHEIGHT );
painter.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ leftMidFrame ] ) : *( DECOPIXINACTARR[ leftMidFrame ] ) );
@@ -2633,28 +2633,28 @@ void DeKoratorClient::paintEvent( TQPaintEvent* )
}
// bottom corner
- if ( leftRightFramesHeight > LEFTTOPFRAMEHEIGHT )
+ if ( leftRightFramesHeight > LEFTUPPERFRAMEHEIGHT )
{
- rect.setRect( 0, TQMAX( h - BOTTOMFRAMESIZE - LEFTBOTTOMCORNERFRAMEHEIGHT, topOffset + LEFTTOPFRAMEHEIGHT ) , LEFTFRAMESIZE, TQMIN( LEFTBOTTOMCORNERFRAMEHEIGHT, leftRightFramesHeight - LEFTTOPFRAMEHEIGHT ) );
+ rect.setRect( 0, TQMAX( h - BOTTOMFRAMESIZE - LEFTLOWERCORNERFRAMEHEIGHT, topOffset + LEFTUPPERFRAMEHEIGHT ) , LEFTFRAMESIZE, TQMIN( LEFTLOWERCORNERFRAMEHEIGHT, leftRightFramesHeight - LEFTUPPERFRAMEHEIGHT ) );
- painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? *( DECOPIXACTARR[ leftBottomCornerFrame ] ) : *( DECOPIXINACTARR[ leftBottomCornerFrame ] ), 0, ( leftRightFramesHeight > LEFTTOPFRAMEHEIGHT + LEFTBOTTOMCORNERFRAMEHEIGHT ) ? 0 : topOffset + LEFTTOPFRAMEHEIGHT - ( h - BOTTOMFRAMESIZE - LEFTBOTTOMCORNERFRAMEHEIGHT ) );
+ painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? *( DECOPIXACTARR[ leftLowerCornerFrame ] ) : *( DECOPIXINACTARR[ leftLowerCornerFrame ] ), 0, ( leftRightFramesHeight > LEFTUPPERFRAMEHEIGHT + LEFTLOWERCORNERFRAMEHEIGHT ) ? 0 : topOffset + LEFTUPPERFRAMEHEIGHT - ( h - BOTTOMFRAMESIZE - LEFTLOWERCORNERFRAMEHEIGHT ) );
- // painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? decoFactory_->buttomLeftFrameBg_ : decoFactory_->buttomLeftFrameBgInAct_, 0, ( leftRightFramesHeight > LEFTTOPFRAMEHEIGHT + LEFTBOTTOMCORNERFRAMEHEIGHT ) ? 0 : TITLESIZE + LEFTTOPFRAMEHEIGHT - ( h - BOTTOMFRAMESIZE - LEFTBOTTOMCORNERFRAMEHEIGHT ) );
+ // painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? decoFactory_->buttomLeftFrameBg_ : decoFactory_->buttomLeftFrameBgInAct_, 0, ( leftRightFramesHeight > LEFTUPPERFRAMEHEIGHT + LEFTLOWERCORNERFRAMEHEIGHT ) ? 0 : TITLESIZE + LEFTUPPERFRAMEHEIGHT - ( h - BOTTOMFRAMESIZE - LEFTLOWERCORNERFRAMEHEIGHT ) );
}
//rightFrame
// top
- rect.setRect( w - RIGHTFRAMESIZE, topOffset , RIGHTFRAMESIZE, TQMIN( RIGHTTOPFRAMEHEIGHT, leftRightFramesHeight ) );
+ rect.setRect( w - RIGHTFRAMESIZE, topOffset , RIGHTFRAMESIZE, TQMIN( RIGHTUPPERFRAMEHEIGHT, leftRightFramesHeight ) );
- painter.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ rightTopFrame ] ) : *( DECOPIXINACTARR[ rightTopFrame ] ) );
+ painter.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ rightUpperFrame ] ) : *( DECOPIXINACTARR[ rightUpperFrame ] ) );
// painter.drawTiledPixmap( rect, isActive() ? decoFactory_->topRightFrameBg_ : decoFactory_->topRightFrameBgInAct_ );
// mid
- if ( leftRightFramesHeight > RIGHTTOPFRAMEHEIGHT + RIGHTBOTTOMCORNERFRAMEHEIGTH )
+ if ( leftRightFramesHeight > RIGHTUPPERFRAMEHEIGHT + RIGHTLOWERCORNERFRAMEHEIGTH )
{
- rect.setRect( w - RIGHTFRAMESIZE, topOffset + RIGHTTOPFRAMEHEIGHT, RIGHTFRAMESIZE, leftRightFramesHeight - RIGHTTOPFRAMEHEIGHT - RIGHTBOTTOMCORNERFRAMEHEIGTH );
+ rect.setRect( w - RIGHTFRAMESIZE, topOffset + RIGHTUPPERFRAMEHEIGHT, RIGHTFRAMESIZE, leftRightFramesHeight - RIGHTUPPERFRAMEHEIGHT - RIGHTLOWERCORNERFRAMEHEIGTH );
painter.drawTiledPixmap( rect, isActive() ? *( DECOPIXACTARR[ rightMidFrame ] ) : *( DECOPIXINACTARR[ rightMidFrame ] ) );
@@ -2662,13 +2662,13 @@ void DeKoratorClient::paintEvent( TQPaintEvent* )
}
// bottom corner
- if ( leftRightFramesHeight > RIGHTTOPFRAMEHEIGHT )
+ if ( leftRightFramesHeight > RIGHTUPPERFRAMEHEIGHT )
{
- rect.setRect( w - RIGHTFRAMESIZE, TQMAX( h - BOTTOMFRAMESIZE - RIGHTBOTTOMCORNERFRAMEHEIGTH, topOffset + RIGHTTOPFRAMEHEIGHT ) , RIGHTFRAMESIZE, TQMIN( RIGHTBOTTOMCORNERFRAMEHEIGTH, leftRightFramesHeight - RIGHTTOPFRAMEHEIGHT ) );
+ rect.setRect( w - RIGHTFRAMESIZE, TQMAX( h - BOTTOMFRAMESIZE - RIGHTLOWERCORNERFRAMEHEIGTH, topOffset + RIGHTUPPERFRAMEHEIGHT ) , RIGHTFRAMESIZE, TQMIN( RIGHTLOWERCORNERFRAMEHEIGTH, leftRightFramesHeight - RIGHTUPPERFRAMEHEIGHT ) );
- painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? *( DECOPIXACTARR[ rightBottomCornerFrame ] ) : *( DECOPIXINACTARR[ rightBottomCornerFrame ] ), 0, ( leftRightFramesHeight > RIGHTTOPFRAMEHEIGHT + RIGHTBOTTOMCORNERFRAMEHEIGTH ) ? 0 : topOffset + RIGHTTOPFRAMEHEIGHT - ( h - BOTTOMFRAMESIZE - RIGHTBOTTOMCORNERFRAMEHEIGTH ) );
+ painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? *( DECOPIXACTARR[ rightLowerCornerFrame ] ) : *( DECOPIXINACTARR[ rightLowerCornerFrame ] ), 0, ( leftRightFramesHeight > RIGHTUPPERFRAMEHEIGHT + RIGHTLOWERCORNERFRAMEHEIGTH ) ? 0 : topOffset + RIGHTUPPERFRAMEHEIGHT - ( h - BOTTOMFRAMESIZE - RIGHTLOWERCORNERFRAMEHEIGTH ) );
- // painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? decoFactory_->buttomRightFrameBg_ : decoFactory_->buttomRightFrameBgInAct_, 0, ( leftRightFramesHeight > RIGHTTOPFRAMEHEIGHT + RIGHTBOTTOMCORNERFRAMEHEIGTH ) ? 0 : TITLESIZE + RIGHTTOPFRAMEHEIGHT - ( h - BOTTOMFRAMESIZE - RIGHTBOTTOMCORNERFRAMEHEIGTH ) );
+ // painter.drawTiledPixmap( rect.x(), rect.y(), rect.width(), rect.height(), isActive() ? decoFactory_->buttomRightFrameBg_ : decoFactory_->buttomRightFrameBgInAct_, 0, ( leftRightFramesHeight > RIGHTUPPERFRAMEHEIGHT + RIGHTLOWERCORNERFRAMEHEIGTH ) ? 0 : TITLESIZE + RIGHTUPPERFRAMEHEIGHT - ( h - BOTTOMFRAMESIZE - RIGHTLOWERCORNERFRAMEHEIGTH ) );
}
}
diff --git a/client/deKoratorclient.h b/client/deKoratorclient.h
index 69aa72a..467360d 100644
--- a/client/deKoratorclient.h
+++ b/client/deKoratorclient.h
@@ -68,22 +68,22 @@ namespace DeKorator
class DeKoratorClient;
enum decoType {
- leftTopCornerFrame = 0,
+ leftUpperCornerFrame = 0,
buttonsLeft,
titleLeft,
titleMid,
titleRight,
buttonsRight,
- rightTopCornerFrame,
- leftTopFrame,
+ rightUpperCornerFrame,
+ leftUpperFrame,
leftMidFrame,
- leftBottomCornerFrame,
+ leftLowerCornerFrame,
bottomLeftFrame,
bottomMidFrame,
bottomRightFrame,
- rightTopFrame,
+ rightUpperFrame,
rightMidFrame,
- rightBottomCornerFrame,
+ rightLowerCornerFrame,
topLeftFrame,
topMidFrame,
topRightFrame,
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-16 21:59:32 +0000