[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/kstyles/plastik
From: Sandro Giessl <sgiessl () gmail ! com>
Date: 2006-07-12 18:21:37
Message-ID: 1152728497.190972.15275.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 561616 by giessl:
port WT_Window frame over from old plastik code
M +13 -49 plastik.cpp
M +0 -50 plastik.h
--- trunk/KDE/kdelibs/kstyles/plastik/plastik.cpp #561615:561616
@@ -38,8 +38,6 @@
Boston, MA 02110-1301, USA.
*/
-#include <QDebug>
-
#include <QPainter>
#include <QTimer>
#include <QEvent>
@@ -871,7 +869,20 @@
}
}
+ }
+ break;
+ case WT_Window:
+ {
+ switch (primitive)
+ {
+ case Generic::Frame:
+ {
+ renderPanel(p, r, pal, true, flags&State_Sunken);
+ return;
+ }
+
+ }
}
break;
@@ -2698,53 +2709,6 @@
}
}
-// void PlastikStyle::drawPrimitive(PrimitiveElement pe,
-// QPainter *p,
-// const QRect &r,
-// const QColorGroup &cg,
-// SFlags flags,
-// const QStyleOption &opt ) const
-// {
-
-// case PE_WindowFrame:
-// if ( opt.isDefault() || opt.lineWidth() <= 0 )
-// break;
-// renderPanel(p, r, cg, true, sunken);
-// break;
-// }
-
-// }
-// }
-//
-//
-// void PlastikStyle::drawControl(ControlElement element,
-// QPainter *p,
-// const QWidget *widget,
-// const QRect &r,
-// const QColorGroup &cg,
-// SFlags flags,
-// const QStyleOption& opt) const
-// {
-// const bool reverseLayout = QApplication::isRightToLeft();
-//
-// const bool enabled = (flags & Style_Enabled);
-//
-// switch (element) {
-//
-
-
-// // Menu and dockwindow empty space
-// //
-// case CE_DockWindowEmptyArea:
-// p->fillRect(r, cg.background());
-// break;
-
-//
-// default:
-// KStyle::drawControl(element, p, widget, r, cg, flags, opt);
-// }
-// }
-
int PlastikStyle::styleHint(StyleHint hint, const QStyleOption * option,
const QWidget * widget, QStyleHintReturn * returnData) \
const {
--- trunk/KDE/kdelibs/kstyles/plastik/plastik.h #561615:561616
@@ -69,56 +69,9 @@
const QWidget* widget = 0,
Option* kOpt = 0) const;
-//
-// void polish(QApplication* app );
virtual void polish(QWidget* widget);
virtual void unpolish(QWidget* widget);
-//
-// void drawKStylePrimitive(KStylePrimitive kpe,
-// QPainter* p,
-// const QWidget* widget,
-// const QRect &r,
-// const QColorGroup &cg,
-// SFlags flags = Style_Default,
-// const QStyleOption& = QStyleOption::Default ) const;
-// void drawControl(ControlElement element,
-// QPainter *p,
-// const QWidget *widget,
-// const QRect &r,
-// const QColorGroup &cg,
-// SFlags flags = Style_Default,
-// const QStyleOption& = QStyleOption::Default ) const;
-//
-// void drawControlMask( ControlElement, QPainter *, const QWidget *, const \
QRect &, const QStyleOption &) const;
-//
-// void drawComplexControl(ComplexControl control,
-// QPainter *p,
-// const QWidget *widget,
-// const QRect &r,
-// const QColorGroup &cg,
-// SFlags flags = Style_Default,
-// SCFlags controls = SC_All,
-// SCFlags active = SC_None,
-// const QStyleOption& = QStyleOption::Default ) const;
-//
-// QRect subRect(SubRect r,
-// const QWidget *widget ) const;
-
-// void drawComplexControlMask(QStyle::ComplexControl c,
-// QPainter *p,
-// const QWidget *w,
-// const QRect &r,
-// const QStyleOption &o=QStyleOption::Default) \
const;
-//
-// QSize sizeFromContents(QStyle::ContentsType t,
-// const QWidget *w,
-// const QSize &s,
-// const QStyleOption &o) const;
-//
-// int styleHint(StyleHint, const QWidget * = 0,
-// const QStyleOption & = QStyleOption::Default,
-// QStyleHintReturn * = 0 ) const;
virtual int styleHint(StyleHint hint, const QStyleOption * option = 0,
const QWidget * widget = 0, QStyleHintReturn * returnData \
= 0) const;
@@ -238,9 +191,6 @@
const bool triangular = false,
const bool cornerWidget = false,
const bool reverseLayout = false) const;
-//
-// virtual void renderMenuBlendPixmap( KPixmap& pix, const QColorGroup& cg,
-// const Q3PopupMenu* popup ) const;
bool eventFilter(QObject *, QEvent *);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic