From 642285e613fd6ee6595bb68bc8a7199920e091e2 Mon Sep 17 00:00:00 2001
From: Guido Ranzuglia granzuglia <guido.ranzuglia@isti.cnr.it>
Date: Mon, 3 Oct 2011 15:51:24 +0000
Subject: [PATCH] changed ExpandButtonWidget arrow icon

---
 src/meshlab/xmlstdpardialog.cpp | 48 ++++++++++++++++++++++++++-------
 src/meshlab/xmlstdpardialog.h   | 19 ++++++++++---
 2 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/src/meshlab/xmlstdpardialog.cpp b/src/meshlab/xmlstdpardialog.cpp
index 11ed434d2..3ad6f67d2 100644
--- a/src/meshlab/xmlstdpardialog.cpp
+++ b/src/meshlab/xmlstdpardialog.cpp
@@ -637,24 +637,24 @@ void XMLAbsWidget::setVisibility( const bool vis )
 }
 
 ExpandButtonWidget::ExpandButtonWidget( QWidget* parent )
-:QWidget(parent),up(QCommonStyle().standardPixmap(QStyle::SP_ArrowUp)),down(QCommonStyle().standardPixmap(QStyle::SP_ArrowDown)),isExpanded(false)
+:QWidget(parent),isExpanded(false)
 {
-	arrow = down;
+	QIcon arrow = QCommonStyle().standardIcon(QStyle::SP_ArrowDown);
 	QHBoxLayout *hlay = new QHBoxLayout(this);
 	//QChar ch(0x0036);
-	exp = new QPushButton(arrow,"",this);
-	exp->setFlat(true);
+	exp = new PrimitiveButton(QStyle::PE_IndicatorArrowDown,this);
+	//exp->setFlat(true);
 	//connect(exp,SIGNAL(clicked(bool)),this,SLOT(expandFrame(bool)));
 	/*QFontMetrics mt(exp->font(),exp);
 	QSize sz = mt.size(Qt::TextSingleLine,arrow);*/
-	QList<QSize> sizes = arrow.availableSizes();
+	/*QList<QSize> sizes = arrow.availableSizes();
 	int min = INT_MAX;
 	for(int ii = 0;ii < sizes.size();++ii)
 		if (sizes[ii].width() < min)
 			min = sizes[ii].width();
 	QSize sz;
-	sz.setWidth(min + 10);
-	//exp->setMaximumSize(sz);
+	sz.setWidth(min + 10);*/
+	
 	hlay->addWidget(exp,0,Qt::AlignHCenter);
 	connect(exp,SIGNAL(clicked(bool)),this,SLOT(changeIcon()));
 }
@@ -668,13 +668,37 @@ void ExpandButtonWidget::changeIcon()
 {
 	isExpanded = !isExpanded;
 	if (isExpanded)
-		arrow = up;
+		exp->setPrimitiveElement(QStyle::PE_IndicatorArrowUp);
 	else
-		arrow = down;
-	exp->setIcon(arrow);
+		exp->setPrimitiveElement(QStyle::PE_IndicatorArrowDown);
+	exp->repaint();
 	emit expandView(isExpanded);
 }
 
+PrimitiveButton::PrimitiveButton(const QStyle::PrimitiveElement el,QWidget* parent )
+:QPushButton(parent),elem(el)
+{
+}
+
+PrimitiveButton::~PrimitiveButton()
+{
+
+}
+
+void PrimitiveButton::paintEvent( QPaintEvent * event )
+{
+	QStylePainter painter(this);
+	QStyleOptionButton option;
+	option.initFrom(this);
+	//painter.drawControl(QStyle::CE_PushButton,option);
+	painter.drawPrimitive (elem,option);
+}
+
+void PrimitiveButton::setPrimitiveElement( const QStyle::PrimitiveElement el)
+{
+	elem = el;
+}
+
 XMLVec3Widget::XMLVec3Widget(const XMLFilterInfo::XMLMap& xmlWidgetTag,EnvWrap& envir,QWidget* p)
 :XMLMeshLabWidget(xmlWidgetTag,envir,p)
 {
@@ -1039,3 +1063,7 @@ XMLMeshWidget::XMLMeshWidget( MeshDocument* mdoc,const XMLFilterInfo::XMLMap& xm
 	if (mdoc->getMesh(def))
 		enumCombo->setCurrentIndex(def);
 }
+
+
+
+
diff --git a/src/meshlab/xmlstdpardialog.h b/src/meshlab/xmlstdpardialog.h
index 5b6bd9765..3a6aa96b8 100644
--- a/src/meshlab/xmlstdpardialog.h
+++ b/src/meshlab/xmlstdpardialog.h
@@ -16,6 +16,7 @@
 #include<QDockWidget>
 #include<QTextEdit>
 #include<QLabel>
+#include "qstyleoption.h"
 
 
 class XMLWidgetException : public MeshLabException
@@ -392,6 +393,19 @@ private:
 	void parameterChanged();*/
 };
 
+class PrimitiveButton : public QPushButton
+{
+	Q_OBJECT
+public:	
+	PrimitiveButton(const QStyle::PrimitiveElement el,QWidget* parent);	
+	~PrimitiveButton();
+	void setPrimitiveElement(const QStyle::PrimitiveElement el);
+protected:
+	void paintEvent(QPaintEvent * event);
+private:
+	QStyle::PrimitiveElement elem;
+};
+
 class ExpandButtonWidget : public QWidget
 {
 	Q_OBJECT
@@ -404,10 +418,7 @@ private slots:
 signals:
 	void expandView(bool exp);
 private:
-	QIcon arrow;
-	const QIcon up;
-	const QIcon down;
-	QPushButton* exp;
+	PrimitiveButton* exp;
 	bool isExpanded;
 };