Fix shaping - KCommonDecoration has a function where to do it,
and I don't see the point in resetting the shape every time in paintEvent(). Partially fixes resizing problems with Qt4.4. svn path=/trunk/KDE/kdebase/workspace/; revision=782673
This commit is contained in:
parent
e179b84940
commit
9fcd3ad674
2 changed files with 2 additions and 5 deletions
|
@ -260,8 +260,6 @@ void OxygenClient::paintEvent(QPaintEvent *e)
|
|||
Q_UNUSED(e)
|
||||
if (!OxygenFactory::initialized()) return;
|
||||
|
||||
doShape();
|
||||
|
||||
QPalette palette = widget()->palette();
|
||||
QPainter painter(widget());
|
||||
|
||||
|
@ -380,7 +378,7 @@ void OxygenClient::paintEvent(QPaintEvent *e)
|
|||
renderDot(&painter, QPointF(6.5, 2.5), 1.8);
|
||||
}
|
||||
|
||||
void OxygenClient::doShape()
|
||||
void OxygenClient::updateWindowShape()
|
||||
{
|
||||
bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows();
|
||||
int w=widget()->width();
|
||||
|
|
|
@ -48,12 +48,11 @@ public:
|
|||
virtual KCommonDecorationButton *createButton(::ButtonType type);
|
||||
virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
|
||||
virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
|
||||
|
||||
virtual void updateWindowShape();
|
||||
virtual void init();
|
||||
|
||||
private:
|
||||
void paintEvent(QPaintEvent *e);
|
||||
void doShape();
|
||||
QColor titlebarTextColor(const QPalette &palette);
|
||||
bool colorCacheInvalid_;
|
||||
QColor cachedTitlebarTextColor_;
|
||||
|
|
Loading…
Reference in a new issue