summaryrefslogtreecommitdiffstats
path: root/src/ui/widget
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2018-01-19 12:10:05 +0000
committerTavmjong Bah <tavmjong@free.fr>2018-01-19 12:10:05 +0000
commit78b5478136fa43a7c225ef5aa433ec9c0926667d (patch)
tree1ccf14209b9980ca8b78482bdfd3664a61cd71f6 /src/ui/widget
parentDon't allow dragging path at cap or line join (diff)
downloadinkscape-78b5478136fa43a7c225ef5aa433ec9c0926667d.tar.gz
inkscape-78b5478136fa43a7c225ef5aa433ec9c0926667d.zip
Move general ellipsize text function out of gradient files.
Diffstat (limited to 'src/ui/widget')
-rw-r--r--src/ui/widget/color-icc-selector.cpp4
-rw-r--r--src/ui/widget/layer-selector.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index 5fba36867..aaf5ba5c2 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -8,6 +8,7 @@
#include <set>
#include "ui/dialog-events.h"
+#include "ui/util.h"
#include "ui/widget/color-icc-selector.h"
#include "ui/widget/color-scales.h"
#include "ui/widget/color-slider.h"
@@ -16,7 +17,6 @@
#include "document.h"
#include "inkscape.h"
#include "profile-manager.h"
-#include "widgets/gradient-vector.h"
#define noDEBUG_LCMS
@@ -685,7 +685,7 @@ void ColorICCSelectorImpl::_profilesChanged(std::string const &name)
Inkscape::ColorProfile *prof = it;
gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 0, gr_ellipsize_text(prof->name, 25).c_str(), 1, prof->name, -1);
+ gtk_list_store_set(store, &iter, 0, ink_ellipsize_text(prof->name, 25).c_str(), 1, prof->name, -1);
if (name == prof->name) {
gtk_combo_box_set_active(combo, index);
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 7a0312192..e0a52a868 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -28,11 +28,11 @@
#include "document-undo.h"
#include "layer-manager.h"
#include "ui/icon-names.h"
+#include "ui/util.h"
#include "util/filter-list.h"
#include "util/reverse-list.h"
#include "verbs.h"
#include "xml/node-event-vector.h"
-#include "widgets/gradient-vector.h"
namespace Inkscape {
namespace Widgets {
@@ -573,7 +573,7 @@ void LayerSelector::_prepareLabelRenderer(
label = _("(root)");
}
- gchar *text = g_markup_printf_escaped(format, gr_ellipsize_text (label, 50).c_str());
+ gchar *text = g_markup_printf_escaped(format, ink_ellipsize_text (label, 50).c_str());
_label_renderer.property_markup() = text;
g_free(text);
g_free(format);