summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/liquid/liquid.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/noncore/styles/liquid/liquid.h b/noncore/styles/liquid/liquid.h
index 0582c9a..22331be 100644
--- a/noncore/styles/liquid/liquid.h
+++ b/noncore/styles/liquid/liquid.h
@@ -145,61 +145,60 @@ public:
145 const QBrush *fill); 145 const QBrush *fill);
146 void drawToolButton(QPainter *p, int x, int y, int w, 146 void drawToolButton(QPainter *p, int x, int y, int w,
147 int h, const QColorGroup &g, 147 int h, const QColorGroup &g,
148 bool sunken, const QBrush *fill); 148 bool sunken, const QBrush *fill);
149 // for repainting toolbuttons when the toolbar is resized 149 // for repainting toolbuttons when the toolbar is resized
150 bool eventFilter(QObject *obj, QEvent *ev); 150 bool eventFilter(QObject *obj, QEvent *ev);
151 void drawSliderGroove(QPainter * p, int x, int y, int w, int h, 151 void drawSliderGroove(QPainter * p, int x, int y, int w, int h,
152 const QColorGroup &g, QCOORD c, Orientation); 152 const QColorGroup &g, QCOORD c, Orientation);
153 void drawSliderGrooveMask(QPainter * p, int x, int y, int w, int h, 153 void drawSliderGrooveMask(QPainter * p, int x, int y, int w, int h,
154 QCOORD c, Orientation); 154 QCOORD c, Orientation);
155 int buttonDefaultIndicatorWidth() const {return(2);} 155 int buttonDefaultIndicatorWidth() const {return(2);}
156 void drawPopupPanel(QPainter *p, int x, int y, int w, int h, 156 void drawPopupPanel(QPainter *p, int x, int y, int w, int h,
157 const QColorGroup &g, int lineWidth, 157 const QColorGroup &g, int lineWidth,
158 const QBrush * fill); 158 const QBrush * fill);
159protected: 159protected:
160 void adjustHSV(QPixmap &pix, int h, int s, int v); 160 void adjustHSV(QPixmap &pix, int h, int s, int v);
161 void intensity(QPixmap &pix, float percent); 161 void intensity(QPixmap &pix, float percent);
162 162
163 void drawRoundButton(QPainter *p, const QColor &c, const QColor &bg, int x, 163 void drawRoundButton(QPainter *p, const QColor &c, const QColor &bg, int x,
164 int y, int w, int h, bool supportPushDown = false, 164 int y, int w, int h, bool supportPushDown = false,
165 bool pushedDown = false, bool autoDefault = false, 165 bool pushedDown = false, bool autoDefault = false,
166 bool isMasked = false); 166 bool isMasked = false);
167 void drawClearBevel(QPainter *p, int x, int y, int w, int h, 167 void drawClearBevel(QPainter *p, int x, int y, int w, int h,
168 const QColor &c, const QColor &bg); 168 const QColor &c, const QColor &bg);
169 void drawSBDeco(QPainter *p, const QRect &r, const QColorGroup &g, 169 void drawSBDeco(QPainter *p, const QRect &r, const QColorGroup &g,
170 bool horiz); 170 bool horiz);
171 void drawSBButton(QPainter *p, const QRect &r, const QColorGroup &g, 171 void drawSBButton(QPainter *p, const QRect &r, const QColorGroup &g,
172 bool down=false, bool fast = true); 172 bool down=false, bool fast = true);
173 void drawRoundRect(QPainter *p, int x, int y, int w, int h); 173 void drawRoundRect(QPainter *p, int x, int y, int w, int h);
174 QPixmap* getPixmap(BitmapData item); 174 QPixmap* getPixmap(BitmapData item);
175 QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false); 175 QPixmap* processEmbedded(const char *label, int h, int s, int v, bool blend=false);
176private: 176private:
177 bool oldqte;
178 bool flatTBButtons; 177 bool flatTBButtons;
179 QWidget *highlightWidget; 178 QWidget *highlightWidget;
180 QBitmap btnMaskBmp, htmlBtnMaskBmp; 179 QBitmap btnMaskBmp, htmlBtnMaskBmp;
181 QPixmap *btnBorderPix, *btnBlendPix, *bevelFillPix, *smallBevelFillPix, *menuPix; 180 QPixmap *btnBorderPix, *btnBlendPix, *bevelFillPix, *smallBevelFillPix, *menuPix;
182 QBrush bgBrush, menuBrush; 181 QBrush bgBrush, menuBrush;
183 bool menuAni, menuFade; 182 bool menuAni, menuFade;
184 183
185 QIntDict<QPixmap>btnDict; 184 QIntDict<QPixmap>btnDict;
186 QIntDict<QPixmap>btnBorderDict; 185 QIntDict<QPixmap>btnBorderDict;
187 QIntDict<QPixmap>bevelFillDict; 186 QIntDict<QPixmap>bevelFillDict;
188 QIntDict<QPixmap>smallBevelFillDict; 187 QIntDict<QPixmap>smallBevelFillDict;
189 188
190 QPixmap *vsbSliderFillPix; 189 QPixmap *vsbSliderFillPix;
191 TransMenuHandler *menuHandler; 190 TransMenuHandler *menuHandler;
192 QPixmap *pixmaps[BITMAP_ITEMS]; 191 QPixmap *pixmaps[BITMAP_ITEMS];
193 QPixmap sbBuffer; 192 QPixmap sbBuffer;
194 int oldSliderThickness; 193 int oldSliderThickness;
195 int lowLightVal; 194 int lowLightVal;
196 QHeader *currentHeader; 195 QHeader *currentHeader;
197 int headerHoverID; 196 int headerHoverID;
198 QWMatrix rMatrix; 197 QWMatrix rMatrix;
199 int bH, bS, bV; 198 int bH, bS, bV;
200 int bHoverH, bHoverS, bHoverV; 199 int bHoverH, bHoverS, bHoverV;
201 int btnH, btnS, btnV; 200 int btnH, btnS, btnV;
202 int btnHoverH, btnHoverS, btnHoverV; 201 int btnHoverH, btnHoverS, btnHoverV;
203}; 202};
204 203
205#endif 204#endif