summaryrefslogtreecommitdiffstats
path: root/src/widgets/swatch-selector.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2010-07-07 05:03:34 +0000
committerJon A. Cruz <jon@joncruz.org>2010-07-07 05:03:34 +0000
commitf20676dc6455b3475ab8729fddf04c2fe64b7c1e (patch)
tree578a28c2e8ebe149df14a4fb93e5dc93beee4770 /src/widgets/swatch-selector.cpp
parentPatch by Johan for LPE Tool prefs page (diff)
downloadinkscape-f20676dc6455b3475ab8729fddf04c2fe64b7c1e.tar.gz
inkscape-f20676dc6455b3475ab8729fddf04c2fe64b7c1e.zip
Tuning fill-n-stroke to support non-solid swatches.
(bzr r9586)
Diffstat (limited to 'src/widgets/swatch-selector.cpp')
-rw-r--r--src/widgets/swatch-selector.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/swatch-selector.cpp b/src/widgets/swatch-selector.cpp
index ce0f8a810..88abca358 100644
--- a/src/widgets/swatch-selector.cpp
+++ b/src/widgets/swatch-selector.cpp
@@ -169,10 +169,9 @@ void SwatchSelector::connectchangedHandler( GCallback handler, void *data )
void SwatchSelector::setVector(SPDocument */*doc*/, SPGradient *vector)
{
//GtkVBox * box = gobj();
-
_gsel->setVector((vector) ? SP_OBJECT_DOCUMENT(vector) : 0, vector);
- if (vector) {
+ if ( vector && vector->isSolid() ) {
SPStop* stop = vector->getFirstStop();
guint32 const colorVal = sp_stop_get_rgba32(stop);
@@ -180,6 +179,9 @@ void SwatchSelector::setVector(SPDocument */*doc*/, SPGradient *vector)
SPColor color( SP_RGBA32_R_F(colorVal), SP_RGBA32_G_F(colorVal), SP_RGBA32_B_F(colorVal) );
// set its color, from the stored array
_csel->base->setColor( color );
+ gtk_widget_show_all( GTK_WIDGET(_csel) );
+ } else {
+ gtk_widget_hide( GTK_WIDGET(_csel) );
}
/*