diff options
| author | Martin Owens <doctormo@gmail.com> | 2018-10-04 13:00:31 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2018-10-05 22:03:39 +0000 |
| commit | 93bd83b73e292ef37d8c4f03e5a9185f870bb0df (patch) | |
| tree | 8ab42f5a785a01fbe4d700613f655372f26d10b6 /src/widgets | |
| parent | fix 1795942 "object to path" uses outdated state (diff) | |
| download | inkscape-93bd83b73e292ef37d8c4f03e5a9185f870bb0df.tar.gz inkscape-93bd83b73e292ef37d8c4f03e5a9185f870bb0df.zip | |
Removal of code but breaks gradients
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/gradient-vector.cpp | 10 | ||||
| -rw-r--r-- | src/widgets/paint-selector.cpp | 4 |
2 files changed, 8 insertions, 6 deletions
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<SelectedColor*>(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<void*>(1)); - csel->setColorAlpha(stop->getEffectiveColor(), stop->opacity); + csel->setColorAlpha(stop->getColor(), stop->getOpacity()); g_object_set_data(G_OBJECT(tbl), "updating_color", reinterpret_cast<void*>(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<SelectedColor*>(g_object_get_data(G_OBJECT(widget), "cselector")); g_object_set_data(G_OBJECT(widget), "updating_color", reinterpret_cast<void*>(1)); - csel->setColorAlpha(stop->getEffectiveColor(), stop->opacity); + csel->setColorAlpha(stop->getColor(), stop->getOpacity()); g_object_set_data(G_OBJECT(widget), "updating_color", reinterpret_cast<void*>(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; } diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index a3a24470e..f26ebe30f 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -670,8 +670,8 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec // Gradient can be null if object paint is changed externally (ie. with a color picker tool) if (gradient) { - SPColor color = gradient->getFirstStop()->specified_color; - float alpha = gradient->getFirstStop()->opacity; + SPColor color = gradient->getFirstStop()->getColor(); + float alpha = gradient->getFirstStop()->getOpacity(); psel->selected_color->setColorAlpha(color, alpha, false); } } |