diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-08-20 12:53:17 +0000 |
|---|---|---|
| committer | John Smith <john.smith7545@yahoo.com> | 2012-08-20 12:53:17 +0000 |
| commit | e92962ddc609aaba91d1b9781ea044e84bafeb1b (patch) | |
| tree | dc25d7d48782832e2c8073f63a2dec4a26081cf8 /src/widgets/stroke-style.h | |
| parent | round-off incoming png resolution to 0.1 dpi (Bug 165952 comment 20) (diff) | |
| download | inkscape-e92962ddc609aaba91d1b9781ea044e84bafeb1b.tar.gz inkscape-e92962ddc609aaba91d1b9781ea044e84bafeb1b.zip | |
Fix for 165865 : markers must take object's stroke color
(bzr r11614)
Diffstat (limited to 'src/widgets/stroke-style.h')
| -rw-r--r-- | src/widgets/stroke-style.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h index fe06e5b81..546880bc2 100644 --- a/src/widgets/stroke-style.h +++ b/src/widgets/stroke-style.h @@ -35,6 +35,7 @@ #include "inkscape.h" #include "io/sys.h" #include "marker.h" +#include "preferences.h" #include "path-prefix.h" #include "selection.h" #include "sp-linear-gradient.h" @@ -81,6 +82,8 @@ Gtk::Widget *sp_stroke_style_line_widget_new(void); */ void sp_stroke_style_widget_set_desktop(Gtk::Widget *widget, SPDesktop *desktop); +SPObject *getMarkerObj(gchar const *n, SPDocument *doc); + namespace Inkscape { class StrokeStyle : public Gtk::VBox @@ -92,7 +95,7 @@ public: private: - SPObject *getMarkerName(gchar const *n, SPDocument *doc); + void updateLine(); void updateAllMarkers(GSList const *objects); void updateMarkerHist(SPMarkerLoc const which); @@ -103,6 +106,10 @@ private: void setCapButtons(Gtk::ToggleButton *active); void scaleLine(); void setScaledDash(SPCSSAttr *css, int ndash, double *dash, double offset, double scale); + void setMarkerColor(SPItem *item, SPObject *marker, MarkerComboBox *marker_combo); + SPObject *forkMarker(SPItem *item, SPObject *marker, MarkerComboBox *marker_combo); + const char *getItemColorForMarker(SPItem *item, Inkscape::PaintTarget fill_or_stroke, MarkerComboBox *marker_combo); + Gtk::RadioButton * makeRadioButton(Gtk::RadioButton *tb, char const *icon, Gtk::HBox *hb, gchar const *key, gchar const *data); static gboolean setStrokeWidthUnit(SPUnitSelector *, |