diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2018-01-19 12:10:05 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2018-01-19 12:10:05 +0000 |
| commit | 78b5478136fa43a7c225ef5aa433ec9c0926667d (patch) | |
| tree | 1ccf14209b9980ca8b78482bdfd3664a61cd71f6 /src/widgets | |
| parent | Don't allow dragging path at cap or line join (diff) | |
| download | inkscape-78b5478136fa43a7c225ef5aa433ec9c0926667d.tar.gz inkscape-78b5478136fa43a7c225ef5aa433ec9c0926667d.zip | |
Move general ellipsize text function out of gradient files.
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/gradient-toolbar.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/mesh-toolbar.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/stroke-marker-selector.cpp | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index 976423aaf..6f2f6a06c 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -39,6 +39,7 @@ #include "style.h" #include "toolbox.h" #include "ui/icon-names.h" +#include "ui/util.h" #include "ui/tools/gradient-tool.h" #include "verbs.h" #include "widgets/gradient-image.h" diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp index 61b41f58f..93be77556 100644 --- a/src/widgets/mesh-toolbar.cpp +++ b/src/widgets/mesh-toolbar.cpp @@ -27,7 +27,6 @@ #include "verbs.h" #include "widgets/spinbutton-events.h" -#include "widgets/gradient-vector.h" #include "widgets/gradient-image.h" #include "style.h" diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 9ddcf993d..51377fd41 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -32,10 +32,11 @@ #include "sp-root.h" #include "ui/cache/svg_preview_cache.h" #include "helper/stock-items.h" -#include "gradient-vector.h" #include <gtkmm/icontheme.h> #include "ui/widget/spinbutton.h" +#include "ui/util.h" + #include "stroke-style.h" static Inkscape::UI::Cache::SvgPreview svg_preview_cache; @@ -389,7 +390,7 @@ void MarkerComboBox::add_markers (std::vector<SPMarker *> const& marker_list, SP else row = *(marker_store->append()); - row[marker_columns.label] = gr_ellipsize_text(markid, 20); + row[marker_columns.label] = ink_ellipsize_text(markid, 20); // Non "stock" markers can also have "inkscape:stockid" (when using extension ColorMarkers), // So use !is_history instead to determine is it is "stock" (ie in the markers.svg file) row[marker_columns.stock] = !history; |