From 4131bedba55adcbb9f7beeead8219a06025f5bab Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Tue, 18 Aug 2015 14:58:30 -0400
Subject: [PATCH] Color button fixes.

---
 glabels/ColorButton.cpp        | 9 ++++++---
 glabels/ColorButton.h          | 2 +-
 glabels/ColorPaletteDialog.cpp | 2 ++
 glabels/ColorPaletteItem.cpp   | 1 +
 glabels/ColorSwatch.cpp        | 1 +
 glabels/ObjectEditor.cpp       | 3 +++
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/glabels/ColorButton.cpp b/glabels/ColorButton.cpp
index ff9e71b..670442f 100644
--- a/glabels/ColorButton.cpp
+++ b/glabels/ColorButton.cpp
@@ -26,8 +26,8 @@
 
 namespace
 {
-	const int SWATCH_W = 100;
-	const int SWATCH_H =  24;
+	const int SWATCH_W = 24;
+	const int SWATCH_H = 24;
 }
 
 
@@ -47,6 +47,7 @@ namespace glabels
 
 		setIcon( QIcon( ColorSwatch( SWATCH_W, SWATCH_H, color ) ) );
 		setText( "" );
+		setCheckable( true );
 
 		mDialog = new ColorPaletteDialog( defaultLabel, defaultColor, color );
 		mDialog->setModal( true );
@@ -130,10 +131,12 @@ namespace glabels
 
 	void ColorButton::onPaletteDialogChanged( ColorNode colorNode, bool isDefault )
 	{
+		setDown( false );
+
 		mColorNode = colorNode;
 		mIsDefault = isDefault;
 
-		emit colorChanged( colorNode, isDefault );
+		emit colorChanged();
 	}
 
 
diff --git a/glabels/ColorButton.h b/glabels/ColorButton.h
index 4a54906..5b1cefc 100644
--- a/glabels/ColorButton.h
+++ b/glabels/ColorButton.h
@@ -49,7 +49,7 @@ namespace glabels
 		// Signals
 		/////////////////////////////////
 	signals:
-		void colorChanged( ColorNode colorNode, bool isDefault );
+		void colorChanged();
 
 
 		/////////////////////////////////
diff --git a/glabels/ColorPaletteDialog.cpp b/glabels/ColorPaletteDialog.cpp
index fcf6819..0a61bd4 100644
--- a/glabels/ColorPaletteDialog.cpp
+++ b/glabels/ColorPaletteDialog.cpp
@@ -125,6 +125,8 @@ namespace glabels
 		QPushButton* mergeFieldButton = new QPushButton( "TODO: Field Button" );
 		layout->addWidget( mergeFieldButton, iAbsRow, 0, 1, PALETTE_COLS );
 
+		setLayout( layout );
+
 		loadCustomColorHistory();
 	}
 
diff --git a/glabels/ColorPaletteItem.cpp b/glabels/ColorPaletteItem.cpp
index 771b4a1..9d55e9d 100644
--- a/glabels/ColorPaletteItem.cpp
+++ b/glabels/ColorPaletteItem.cpp
@@ -45,6 +45,7 @@ namespace glabels
 					    QWidget*       parent )
 		: QPushButton(parent), mId(id), mColor(color), mTip(tip)
 	{
+		setFlat( true );
 		setIcon( QIcon( ColorSwatch( wSwatch, hSwatch, color ) ) );
 		setToolTip( tip );
 
diff --git a/glabels/ColorSwatch.cpp b/glabels/ColorSwatch.cpp
index 304a8c2..4e20b42 100644
--- a/glabels/ColorSwatch.cpp
+++ b/glabels/ColorSwatch.cpp
@@ -40,6 +40,7 @@ namespace glabels
 	/// Constructor
 	///
 	ColorSwatch::ColorSwatch( int w, int h, const QColor& color )
+		: QPixmap( w, h )
 	{
 		fill( Qt::transparent );
 
diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp
index 4a57787..af7ab10 100644
--- a/glabels/ObjectEditor.cpp
+++ b/glabels/ObjectEditor.cpp
@@ -39,6 +39,9 @@ namespace glabels
 	{
 		setupUi( this );
 
+		lineColorButton->init( "No line", QColor(0,0,0,0), QColor(0,0,0,255) );
+		fillColorButton->init( "No fill", QColor(0,0,0,0), QColor(0,0,0,255) );
+
 		setEnabled( false );
 		hidePages();
 	}