diff options
| author | Thomas Holder <thomas@thomas-holder.de> | 2019-02-02 11:06:00 +0000 |
|---|---|---|
| committer | Thomas Holder <thomas@thomas-holder.de> | 2019-02-02 11:06:00 +0000 |
| commit | 009fa0666efe9d100556a7351ec31273fea075ba (patch) | |
| tree | 182b6d0411599b3b9f70c9756cf0d325549e663e | |
| parent | Add missing new symbolic icons (diff) | |
| download | inkscape-009fa0666efe9d100556a7351ec31273fea075ba.tar.gz inkscape-009fa0666efe9d100556a7351ec31273fea075ba.zip | |
object properties dialog: label placeholder
| -rw-r--r-- | src/ui/dialog/object-properties.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp index b43a73c18..7ec9ccafa 100644 --- a/src/ui/dialog/object-properties.cpp +++ b/src/ui/dialog/object-properties.cpp @@ -339,7 +339,14 @@ void ObjectProperties::update() _label_id.set_markup_with_mnemonic(_("_ID:") + Glib::ustring(" ")); /* Label */ - _entry_label.set_text(obj->defaultLabel()); + char const *currentlabel = obj->label(); + char const *placeholder = ""; + if (!currentlabel) { + currentlabel = ""; + placeholder = obj->defaultLabel(); + } + _entry_label.set_text(currentlabel); + _entry_label.set_placeholder_text(placeholder); _entry_label.set_sensitive(TRUE); /* Title */ @@ -421,7 +428,8 @@ void ObjectProperties::_labelChanged() * using the widget's label text */ SPObject *obj = static_cast<SPObject*>(item); - if (label.compare(obj->defaultLabel())) { + char const *currentlabel = obj->label(); + if (label.compare(currentlabel ? currentlabel : "")) { obj->setLabel(label.c_str()); DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_DIALOG_ITEM, _("Set object label")); |