From 93bd83b73e292ef37d8c4f03e5a9185f870bb0df Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Thu, 4 Oct 2018 09:00:31 -0400 Subject: Removal of code but breaks gradients --- src/widgets/gradient-vector.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/widgets/gradient-vector.cpp') diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp index 91f5ebc77..f748a9841 100644 --- a/src/widgets/gradient-vector.cpp +++ b/src/widgets/gradient-vector.cpp @@ -605,7 +605,7 @@ static void sp_grad_edit_combo_box_changed (GtkComboBox * /*widget*/, GtkWidget SelectedColor *csel = static_cast(g_object_get_data(G_OBJECT(tbl), "cselector")); // set its color, from the stored array g_object_set_data(G_OBJECT(tbl), "updating_color", reinterpret_cast(1)); - csel->setColorAlpha(stop->getEffectiveColor(), stop->opacity); + csel->setColorAlpha(stop->getColor(), stop->getOpacity()); g_object_set_data(G_OBJECT(tbl), "updating_color", reinterpret_cast(0)); GtkWidget *offspin = GTK_WIDGET(g_object_get_data(G_OBJECT(tbl), "offspn")); GtkWidget *offslide =GTK_WIDGET(g_object_get_data(G_OBJECT(tbl), "offslide")); @@ -1083,7 +1083,7 @@ static void sp_gradient_vector_widget_load_gradient(GtkWidget *widget, SPGradien SelectedColor *csel = static_cast(g_object_get_data(G_OBJECT(widget), "cselector")); g_object_set_data(G_OBJECT(widget), "updating_color", reinterpret_cast(1)); - csel->setColorAlpha(stop->getEffectiveColor(), stop->opacity); + csel->setColorAlpha(stop->getColor(), stop->getOpacity()); g_object_set_data(G_OBJECT(widget), "updating_color", reinterpret_cast(0)); /* Fill preview */ @@ -1227,8 +1227,10 @@ static void sp_gradient_vector_color_dragged(Inkscape::UI::SelectedColor *select return; } - selected_color->colorAlpha(stop->specified_color, stop->opacity); - stop->currentColor = false; + SPColor color = stop->getColor(); + gfloat opacity = stop->getOpacity(); + selected_color->colorAlpha(color, opacity); + stop->style->stop_color.currentcolor = false; blocked = FALSE; } -- cgit v1.2.3