Fix QToolButton drawing

2 files changed, 14 insertions, 0 deletions

diff --git a/noncore/styles/theme/othemestyle.cpp b/noncore/styles/theme/othemestyle.cpp
index 61127b8..d97b026 100644
--- a/noncore/styles/theme/othemestyle.cpp
+++ b/noncore/styles/theme/othemestyle.cpp
@@ -300,24 +300,32 @@ void OThemeStyle::drawComboButtonMask( QPainter *p, int x, int y, int w, int h )
 {
 	drawBaseMask( p, x, y, w, h, roundComboBox() );
 }
 
 void OThemeStyle::drawBevelButton( QPainter *p, int x, int y, int w, int h,
                                    const QColorGroup &g, bool sunken,
                                    const QBrush * )
 {
 	WidgetType type = sunken ? BevelDown : Bevel;
 	drawBaseButton( p, x, y, w, h, *colorGroup( g, type ), sunken, false, type );
 }
 
+void OThemeStyle::drawToolButton( QPainter *p, int x, int y, int w, int h,
+                                  const QColorGroup &g, bool sunken,
+                                  const QBrush * )
+{
+	WidgetType type = sunken ? ToolButtonDown : ToolButton;
+	drawBaseButton( p, x, y, w, h, *colorGroup( g, type ), sunken, false, type );
+}
+
 #if 0
 void OThemeStyle::drawKToolBarButton( QPainter *p, int x, int y, int w, int h,
                                       const QColorGroup &g, bool sunken,
                                       bool raised, bool enabled, bool popup,
                                       KToolButtonType type, const QString &btext,
                                       const QPixmap *pixmap, QFont *font,
                                       QWidget * )
 {
 	QFont tmp_font( QString::fromLatin1( "Helvetica" ), 10 );
 	if ( font )
 		tmp_font = *font;
 	QFontMetrics fm( tmp_font );
diff --git a/noncore/styles/theme/othemestyle.h b/noncore/styles/theme/othemestyle.h
index 02bec78..52445c4 100644
--- a/noncore/styles/theme/othemestyle.h
+++ b/noncore/styles/theme/othemestyle.h
@@ -100,24 +100,30 @@ public:
 	virtual void drawButton( QPainter *p, int x, int y, int w, int h,
 	                         const QColorGroup &g, bool sunken = FALSE,
 	                         const QBrush *fill = 0 );
 	/**
 	 * Draw a bevel button.
 	 *
 	 * This calls @ref drawBaseButton() with Bevel as the
 	 * widget type.
 	 */
 	virtual void drawBevelButton( QPainter *p, int x, int y, int w, int h,
 	                              const QColorGroup &g, bool sunken = FALSE,
 	                              const QBrush *fill = 0 );
+	/**
+	 * Draw a toolbar button.
+	 */
+	virtual void drawToolButton ( QPainter *p, int x, int y, int w, int h,
+	                              const QColorGroup &g, bool sunken = FALSE,
+	                              const QBrush *fill = 0 );
 #if 0
 	/**
 	 * Draw a toolbar button.
 	 */
 	virtual void drawKToolBarButton( QPainter *p, int x, int y, int w, int h,
 	                                 const QColorGroup &g, bool sunken = false,
 	                                 bool raised = true, bool enabled = true,
 	                                 bool popup = false, KToolButtonType type = Icon,
 	                                 const QString &btext = QString::null,
 	                                 const QPixmap *icon = NULL,
 	                                 QFont *font = NULL, QWidget *btn = NULL );
 	/**