diff --git a/clients/oxygen/CMakeLists.txt b/clients/oxygen/CMakeLists.txt index 7acf5b36d..06d9bf7e8 100644 --- a/clients/oxygen/CMakeLists.txt +++ b/clients/oxygen/CMakeLists.txt @@ -1,24 +1,23 @@ ########### next target ############### set(kwin_oxy_SRCS lib/helper.cpp oxygenclient.cpp oxygenbutton.cpp oxygen.cpp - definitions.cpp ) kde4_add_plugin(kwin3_oxy ${kwin_oxy_SRCS}) target_link_libraries(kwin3_oxy ${KDE4_KDEUI_LIBS} ${X11_Xrender_LIB} kdecorations) install(TARGETS kwin3_oxy DESTINATION ${PLUGIN_INSTALL_DIR} ) ########### install files ############### install( FILES oxygenclient.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ ) diff --git a/clients/oxygen/definitions.cpp b/clients/oxygen/definitions.cpp deleted file mode 100644 index f4c130d46..000000000 --- a/clients/oxygen/definitions.cpp +++ /dev/null @@ -1,35 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// oxygenbutton.h -// ------------------- -// Oxygen window decoration for KDE. Definitions of some global constants using -// preprocessor directives. -// ------------------- -// Copyright (c) 2006, 2007 Riccardo Iaconelli -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -////////////////////////////////////////////////////////////////////////////// - -#define BUTTONSIZE 18 -#define DECOSIZE 8 -#define TITLESIZE 18 -#define TFRAMESIZE 4 -#define BFRAMESIZE 4 -#define LFRAMESIZE 4 -#define RFRAMESIZE 4 -#define FRAMEBUTTONSPACE 67 diff --git a/clients/oxygen/oxygen.h b/clients/oxygen/oxygen.h index 4fc51da20..f62314f1d 100644 --- a/clients/oxygen/oxygen.h +++ b/clients/oxygen/oxygen.h @@ -1,76 +1,80 @@ ////////////////////////////////////////////////////////////////////////////// // oxygenbutton.h // ------------------- // Oxygen window decoration for KDE. // ------------------- // Copyright (c) 2006, 2007 Riccardo Iaconelli // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to // deal in the Software without restriction, including without limitation the // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or // sell copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: // // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. // // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. ////////////////////////////////////////////////////////////////////////////// #ifndef OXYGEN_H #define OXYGEN_H #include #include namespace Oxygen { // OxygenFactory ///////////////////////////////////////////////////////////// -static const int OXYGEN_BUTTONSIZE = 21; +static const int OXYGEN_BUTTONSIZE = 22; +#define TFRAMESIZE 3 +#define BFRAMESIZE 4 +#define LFRAMESIZE 4 +#define RFRAMESIZE 4 enum ButtonType { ButtonHelp=0, ButtonMax, ButtonMin, ButtonClose, ButtonMenu, ButtonSticky, ButtonTypeCount }; Q_DECLARE_FLAGS(ButtonTypes, ButtonType) class OxygenFactory: public KDecorationFactory { public: OxygenFactory(); virtual ~OxygenFactory(); virtual KDecoration *createDecoration(KDecorationBridge *b); virtual bool reset(unsigned long changed); static bool initialized(); static Qt::Alignment titleAlign(); private: bool readConfig(); private: static bool initialized_; static Qt::Alignment titlealign_; }; inline bool OxygenFactory::initialized() { return initialized_; } inline Qt::Alignment OxygenFactory::titleAlign() { return titlealign_; } } //namespace Oxygen #endif diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp index a980cef0b..c7c05b145 100644 --- a/clients/oxygen/oxygenbutton.cpp +++ b/clients/oxygen/oxygenbutton.cpp @@ -1,233 +1,249 @@ ////////////////////////////////////////////////////////////////////////////// // oxygenbutton.cpp // ------------------- // Oxygen window decoration for KDE. Buttons. // ------------------- // Copyright (c) 2006, 2007 Riccardo Iaconelli // Copyright (c) 2006, 2007 Casper Boemann // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to // deal in the Software without restriction, including without limitation the // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or // sell copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: // // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. // // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. ////////////////////////////////////////////////////////////////////////////// #include #include #include #include #include #include #include +#include +#include #include "oxygenclient.h" #include "oxygenbutton.h" #include "oxygen.h" -#include "definitions.cpp" namespace Oxygen { // class OxygenClient; /* extern int BUTTONSIZE; extern int DECOSIZE;*/ // static const int DECOSIZE = 8; ////////////////////////////////////////////////////////////////////////////// // OxygenButton Class // ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// // OxygenButton() // --------------- // Constructor OxygenButton::OxygenButton(OxygenClient &parent, const QString& tip, ButtonType type) : KCommonDecorationButton((::ButtonType)type, &parent) , client_(parent) , helper_(parent.helper_) , type_(type) , lastmouse_(0) , colorCacheInvalid_(true) { setAutoFillBackground(false); setAttribute(Qt::WA_OpaquePaintEvent, false); setFixedSize(OXYGEN_BUTTONSIZE, OXYGEN_BUTTONSIZE); setCursor(Qt::ArrowCursor); setToolTip(tip); } OxygenButton::~OxygenButton() { } //declare function from oxygenclient.cpp QColor reduceContrast(const QColor &c0, const QColor &c1, double t); QColor OxygenButton::buttonDetailColor(const QPalette &palette) { if (client_.isActive()) return palette.color(QPalette::Active, QPalette::ButtonText); else { if (colorCacheInvalid_) { QColor ab = palette.color(QPalette::Active, QPalette::Button); QColor af = palette.color(QPalette::Active, QPalette::ButtonText); QColor nb = palette.color(QPalette::Inactive, QPalette::Button); QColor nf = palette.color(QPalette::Inactive, QPalette::ButtonText); colorCacheInvalid_ = false; cachedButtonDetailColor_ = reduceContrast(nb, nf, qMax(2.5, KColorUtils::contrastRatio(ab, KColorUtils::mix(ab, af, 0.4)))); } return cachedButtonDetailColor_; } } ////////////////////////////////////////////////////////////////////////////// // sizeHint() // ---------- // Return size hint QSize OxygenButton::sizeHint() const { return QSize(OXYGEN_BUTTONSIZE, OXYGEN_BUTTONSIZE); } ////////////////////////////////////////////////////////////////////////////// // enterEvent() // ------------ // Mouse has entered the button void OxygenButton::enterEvent(QEvent *e) { - // if we wanted to do mouseovers, we would keep track of it here + KCommonDecorationButton::enterEvent(e); if (status_ != Oxygen::Pressed) { status_ = Oxygen::Hovered; } - QAbstractButton::enterEvent(e); + update(); } ////////////////////////////////////////////////////////////////////////////// // leaveEvent() // ------------ // Mouse has left the button void OxygenButton::leaveEvent(QEvent *e) { + KCommonDecorationButton::leaveEvent(e); // if we wanted to do mouseovers, we would keep track of it here status_ = Oxygen::Normal; - QAbstractButton::leaveEvent(e); + update(); } ////////////////////////////////////////////////////////////////////////////// // pressSlot() // ------------ // Mouse has pressed the button void OxygenButton::pressSlot() { status_ = Oxygen::Pressed; update(); } ////////////////////////////////////////////////////////////////////////////// // drawButton() // ------------ // Draw the button void OxygenButton::paintEvent(QPaintEvent *) { QPainter painter(this); QPalette pal = palette(); // de-const-ify if (type_ == ButtonMenu) { // we paint the mini icon (which is 16 pixels high) int dx = (width() - 16) / 2; int dy = (height() - 16) / 2; painter.drawPixmap(dx, dy, client_.icon().pixmap(16)); return; } // Set palette to the right group. Lubos disagrees with this being a kwin // bug, but anyway, we need the palette group to match the current window. // Since kwin doesn't set it correctly, we have to do it ourselves. if (client_.isActive()) pal.setCurrentColorGroup(QPalette::Active); else pal.setCurrentColorGroup(QPalette::Inactive); if(client_.maximizeMode() == OxygenClient::MaximizeRestore) - painter.translate(0,-2); + painter.translate(0,-1); QColor bg = helper_.backgroundTopColor(pal.window()); - painter.drawPixmap(0, 0, helper_.windecoButton(pal.button())); + + QLinearGradient lg = helper_.decoGradient(QRect(4,4,13,13), buttonDetailColor(pal)); + + if(status_ == Oxygen::Hovered) { + if(type_ == ButtonClose) { + QColor color = KColorScheme(pal.currentColorGroup()).foreground(KColorScheme::NegativeText).color(); + lg = helper_.decoGradient(QRect(4,4,13,13), color); + painter.drawPixmap(0, 0, helper_.windecoButtonFocused(pal.button(), color,7)); + } + else{ + QColor color = KColorScheme(pal.currentColorGroup()).decoration(KColorScheme::HoverColor).color(); + painter.drawPixmap(0, 0, helper_.windecoButtonFocused(pal.button(), color, 7)); + } + } + else + painter.drawPixmap(0, 0, helper_.windecoButton(pal.button())); painter.setRenderHints(QPainter::Antialiasing); painter.setBrush(Qt::NoBrush); - QLinearGradient lg = helper_.decoGradient(QRect(4,4,13,13), buttonDetailColor(pal)); painter.setPen(QPen(lg, 2.2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); switch(type_) { case ButtonSticky: painter.drawPoint(QPointF(10.5,10.5)); break; case ButtonHelp: painter.translate(1.5, 1.5); painter.drawArc(7,5,4,4,135*16, -180*16); painter.drawArc(9,8,4,4,135*16,45*16); painter.drawPoint(9,12); break; case ButtonMin: painter.drawLine(QPointF( 7.5, 9.5), QPointF(10.5,12.5)); painter.drawLine(QPointF(10.5,12.5), QPointF(13.5, 9.5)); break; case ButtonMax: switch(client_.maximizeMode()) { case OxygenClient::MaximizeRestore: case OxygenClient::MaximizeVertical: case OxygenClient::MaximizeHorizontal: painter.drawLine(QPointF( 7.5,11.5), QPointF(10.5, 8.5)); painter.drawLine(QPointF(10.5, 8.5), QPointF(13.5,11.5)); break; case OxygenClient::MaximizeFull: { painter.translate(1.5, 1.5); //painter.setBrush(lg); QPoint points[4] = {QPoint(9, 6), QPoint(12, 9), QPoint(9, 12), QPoint(6, 9)}; //QPoint points[4] = {QPoint(9, 5), QPoint(13, 9), QPoint(9, 13), QPoint(5, 9)}; painter.drawPolygon(points, 4); break; } } break; case ButtonClose: painter.drawLine(QPointF( 7.5,7.5), QPointF(13.5,13.5)); painter.drawLine(QPointF(13.5,7.5), QPointF( 7.5,13.5)); break; default: break; } } } //namespace Oxygen diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp index 268e16c40..eae5091e6 100644 --- a/clients/oxygen/oxygenclient.cpp +++ b/clients/oxygen/oxygenclient.cpp @@ -1,430 +1,417 @@ ////////////////////////////////////////////////////////////////////////////// // oxygenclient.cpp // ------------------- // Oxygen window decoration for KDE // ------------------- // Copyright (c) 2003, 2004 David Johnson // Copyright (c) 2006, 2007 Casper Boemann // Copyright (c) 2006, 2007 Riccardo Iaconelli // // Please see the header file for copyright and license information. ////////////////////////////////////////////////////////////////////////////// // #ifndef OXYGENCLIENT_H // #define OXYGENCLIENT_H #include #include #include #include #include #include #include #include #include #include //Added by qt3to4: #include #include #include #include #include #include #include #include #include #include #include "math.h" #include "oxygenclient.h" #include "oxygenclient.moc" #include "oxygenbutton.h" #include "oxygen.h" -#include "definitions.cpp" - namespace Oxygen { -// global constants - -// static const int BUTTONSIZE = 18; -// static const int DECOSIZE = 8; -// static const int TITLESIZE = 18; -// static const int TFRAMESIZE = 8; -// static const int BFRAMESIZE = 7; -// static const int LFRAMESIZE = 8; -// static const int RFRAMESIZE = 7;BUTTONSIZE -// static const int FRAMEBUTTONSPACE = 67; - K_GLOBAL_STATIC_WITH_ARGS(OxygenHelper, globalHelper, ("OxygenDeco")) void renderDot(QPainter *p, const QPointF &point, qreal diameter) { p->drawEllipse(QRectF(point.x()-diameter/2, point.y()-diameter/2, diameter, diameter)); } OxygenClient::OxygenClient(KDecorationBridge *b, KDecorationFactory *f) : KCommonDecoration(b, f) , helper_(*globalHelper) , colorCacheInvalid_(true) { } OxygenClient::~OxygenClient() { } QString OxygenClient::visibleName() const { return i18n("Oxygen"); } QString OxygenClient::defaultButtonsLeft() const { return "M"; } QString OxygenClient::defaultButtonsRight() const { return "HIAX"; } void OxygenClient::init() { KCommonDecoration::init(); widget()->setAutoFillBackground(false); widget()->setAttribute(Qt::WA_OpaquePaintEvent); widget()->setAttribute(Qt::WA_PaintOnScreen, false); } bool OxygenClient::decorationBehaviour(DecorationBehaviour behaviour) const { switch (behaviour) { case DB_MenuClose: return true;//Handler()->menuClose(); case DB_WindowMask: return false; default: return KCommonDecoration::decorationBehaviour(behaviour); } } int OxygenClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); switch (lm) { case LM_BorderLeft: case LM_BorderRight: case LM_BorderBottom: { if (respectWindowState && maximized) { return 0; } else { return BFRAMESIZE; } } case LM_TitleEdgeTop: { if (respectWindowState && maximized) { return 0; } else { return TFRAMESIZE; } } case LM_TitleEdgeBottom: { return 0; } case LM_TitleEdgeLeft: case LM_TitleEdgeRight: { if (respectWindowState && maximized) { return 0; } else { return 6; } } case LM_TitleBorderLeft: case LM_TitleBorderRight: return 5; case LM_ButtonWidth: case LM_ButtonHeight: case LM_TitleHeight: { if (respectWindowState && isToolWindow()) { return OXYGEN_BUTTONSIZE; } else { return OXYGEN_BUTTONSIZE; } } case LM_ButtonSpacing: return 1; case LM_ButtonMarginTop: return 0; case LM_ExplicitButtonSpacer: return 3; default: return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } KCommonDecorationButton *OxygenClient::createButton(::ButtonType type) { switch (type) { case MenuButton: return new OxygenButton(*this, i18n("Menu"), ButtonMenu); case HelpButton: return new OxygenButton(*this, i18n("Help"), ButtonHelp); case MinButton: return new OxygenButton(*this, i18n("Minimize"), ButtonMin); case MaxButton: return new OxygenButton(*this, i18n("Minimize"), ButtonMax); case CloseButton: return new OxygenButton(*this, i18n("Minimize"), ButtonClose); default: return 0; } } // c0 - background // c1 - foreground // t - target contrast ratio QColor reduceContrast(const QColor &c0, const QColor &c1, double t) { double s = KColorUtils::contrastRatio(c0, c1); if (s < t) return c1; double l = 0.0, h = 1.0; double x = s, a; QColor r = c1; for (int maxiter = 16; maxiter; --maxiter) { a = 0.5 * (l + h); r = KColorUtils::mix(c0, c1, a); x = KColorUtils::contrastRatio(c0, r); if (fabs(x - t) < 0.01) break; if (x > t) h = a; else l = a; } return r; } QColor OxygenClient::titlebarTextColor(const QPalette &palette) { if (isActive()) return palette.color(QPalette::Active, QPalette::WindowText); else { if(colorCacheInvalid_) { QColor ab = palette.color(QPalette::Active, QPalette::Window); QColor af = palette.color(QPalette::Active, QPalette::WindowText); QColor nb = palette.color(QPalette::Inactive, QPalette::Window); QColor nf = palette.color(QPalette::Inactive, QPalette::WindowText); colorCacheInvalid_ = false; cachedTitlebarTextColor_ = reduceContrast(nb, nf, qMax(2.5, KColorUtils::contrastRatio(ab, KColorUtils::mix(ab, af, 0.4)))); } return cachedTitlebarTextColor_; } } void OxygenClient::paintEvent(QPaintEvent *e) { Q_UNUSED(e) if (!OxygenFactory::initialized()) return; doShape(); QPalette palette = widget()->palette(); QPainter painter(widget()); // Set palette to the right group. Lubos disagrees with this being a kwin // bug, but anyway, we need the palette group to match the current window. // Since kwin doesn't set it correctly, we have to do it ourselves. if (isActive()) palette.setCurrentColorGroup(QPalette::Active); else palette.setCurrentColorGroup(QPalette::Inactive); int x,y,w,h; QRect frame = widget()->frameGeometry(); QColor color = palette.window(); const int titleHeight = layoutMetric(LM_TitleHeight); const int titleTop = layoutMetric(LM_TitleEdgeTop) + frame.top(); const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); const int marginLeft = layoutMetric(LM_TitleBorderLeft); const int marginRight = layoutMetric(LM_TitleBorderRight); const int titleLeft = frame.left() + titleEdgeLeft + buttonsLeftWidth() + marginLeft; const int titleWidth = frame.width() - titleEdgeLeft - layoutMetric(LM_TitleEdgeRight) - buttonsLeftWidth() - buttonsRightWidth() - marginLeft - marginRight; int splitY = qMin(300, 3*frame.height()/4); QPixmap tile = helper_.verticalGradient(color, splitY); painter.drawTiledPixmap(QRect(0, 0, frame.width(), titleHeight + TFRAMESIZE), tile); painter.drawTiledPixmap(QRect(0, 0, LFRAMESIZE, splitY), tile); painter.fillRect(0, splitY, LFRAMESIZE, frame.height() - splitY, helper_.backgroundBottomColor(color)); painter.drawTiledPixmap(QRect(frame.width()-RFRAMESIZE, 0, RFRAMESIZE, splitY), tile, QPoint(frame.width()-RFRAMESIZE, 0)); painter.fillRect(frame.width()-RFRAMESIZE, splitY, RFRAMESIZE, frame.height() - splitY, helper_.backgroundBottomColor(color)); painter.fillRect(0, frame.height() - BFRAMESIZE, frame.width(), BFRAMESIZE, helper_.backgroundBottomColor(color)); int radialW = qMin(600, frame.width()); tile = helper_.radialGradient(color, radialW); QRect radialRect = QRect((frame.width() - radialW) / 2, 0, radialW, 64); painter.drawPixmap(radialRect, tile); //painter.setRenderHint(QPainter::Antialiasing,true); // draw title text painter.setFont(options()->font(isActive(), false)); painter.setPen(titlebarTextColor(palette)); - painter.drawText(titleLeft, titleTop-2, titleWidth, titleHeight, // -2 is to go into top risizearea + painter.drawText(titleLeft, titleTop-1, titleWidth, titleHeight, // -1 is to go into top resizearea OxygenFactory::titleAlign() | Qt::AlignVCenter, caption()); painter.setRenderHint(QPainter::Antialiasing); // Draw dividing line frame = widget()->rect(); frame.getRect(&x, &y, &w, &h); QColor light = helper_.calcLightColor(palette.window()); QColor dark = helper_.calcDarkColor(palette.window()); dark.setAlpha(120); if(!isActive()) { light.setAlpha(120); dark.setAlpha(50); } QLinearGradient lg(x,0,x+w,0); lg.setColorAt(0.5, dark); dark.setAlpha(0); lg.setColorAt(0.0, dark); lg.setColorAt(1.0, dark); painter.setPen(QPen(lg,1)); painter.drawLine(QPointF(x, titleTop+titleHeight-1.5), QPointF(x+w, titleTop+titleHeight-1.5)); lg = QLinearGradient(x,0,x+w,0); lg.setColorAt(0.5, light); light.setAlpha(0); lg.setColorAt(0.0, light); lg.setColorAt(1.0, light); painter.setPen(QPen(lg,1)); painter.drawLine(QPointF(x, titleTop+titleHeight-0.5), QPointF(x+w, titleTop+titleHeight-0.5)); // Draw shadows of the frame painter.setBrush(Qt::NoBrush); painter.setPen(QColor(255,255,255, 120)); painter.drawLine(QPointF(0, 0.5), QPointF(w, 0.5)); painter.setPen(QColor(128,128,128, 60)); painter.drawLine(QPointF(0.5, 0), QPointF(0.5, h)); painter.drawLine(QPointF(w-0.5, 0), QPointF(w-0.5, h)); painter.setPen(QColor(0,0,0, 60)); painter.drawLine(QPointF(0, h-0.5), QPointF(w, h-0.5)); painter.setPen(QColor(0,0,0, 40)); painter.drawPoint(QPointF(1.5, 1.5)); // top middle point painter.drawPoint(QPointF(w-1.5, 1.5)); painter.drawPoint(QPointF(3.5, 0.5)); // top away points painter.drawPoint(QPointF(w-3.5, 0.5)); painter.drawPoint(QPointF(0.5, 3.5)); painter.drawPoint(QPointF(w-0.5, 3.5)); painter.drawPoint(QPointF(1.5, h-1.5)); // bottom middle point painter.drawPoint(QPointF(w-1.5, h-1.5)); // Draw the 3-dots resize handles qreal cenY = frame.height() / 2 + 0.5; qreal posX = frame.width() - 2.5; painter.setPen(Qt::NoPen); painter.setBrush(QColor(0, 0, 0, 66)); renderDot(&painter, QPointF(posX, cenY - 3), 1.8); renderDot(&painter, QPointF(posX, cenY), 1.8); renderDot(&painter, QPointF(posX, cenY + 3), 1.8); painter.translate(frame.width()-9, frame.height()-9); renderDot(&painter, QPointF(2.5, 6.5), 1.8); renderDot(&painter, QPointF(5.5, 5.5), 1.8); renderDot(&painter, QPointF(6.5, 2.5), 1.8); } void OxygenClient::doShape() { bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); int r=widget()->width(); int b=widget()->height(); QRegion mask(0,0,r,b); if(maximized) { setMask(mask); return; } // Remove top-left corner. mask -= QRegion(0, 0, 3, 1); mask -= QRegion(0, 1, 1, 1); mask -= QRegion(0, 2, 1, 1); // Remove top-right corner. mask -= QRegion(r - 3, 0, 3, 1); mask -= QRegion(r - 1, 1, 1, 1); mask -= QRegion(r - 1, 2, 1, 1); // Remove bottom-left corner. mask -= QRegion(0, b-1-0, 3, b-1-1); mask -= QRegion(0, b-1-1, 1, b-1-1); mask -= QRegion(0, b-1-2, 1, b-1-1); // Remove bottom-right corner. mask -= QRegion(r - 3, b-1-0, 3, b-1-1); mask -= QRegion(r - 1, b-1-1, 1, b-1-1); mask -= QRegion(r - 1, b-1-2, 1, b-1-1); setMask(mask); } } //namespace Oxygen //#include "oxygenclient.moc" // #endif