summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/styledialog.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2019-05-04 16:12:04 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-06-02 09:50:16 +0000
commit3712d3b5b9cd2f185fa87c43f769cf9e11dfe926 (patch)
tree17cccc808cd8166b03200c9db56d904dcf204b2e /src/ui/dialog/styledialog.cpp
parentStyling fixes and remove a crash (diff)
downloadinkscape-3712d3b5b9cd2f185fa87c43f769cf9e11dfe926.tar.gz
inkscape-3712d3b5b9cd2f185fa87c43f769cf9e11dfe926.zip
Removing unwanted selector
Diffstat (limited to 'src/ui/dialog/styledialog.cpp')
-rw-r--r--src/ui/dialog/styledialog.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index db68922e9..c12dcdcf7 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -482,6 +482,9 @@ void StyleDialog::_readStyleElement()
g_warning("Glade file loading failed for filter effect dialog");
return;
}
+ Gtk::Label *CSSSelector;
+ _builder->get_widget("CSSSelector", CSSSelector);
+ CSSSelector->set_text("element.attributes");
Gtk::Box *CSSSelectorContainer;
_builder->get_widget("CSSSelectorContainer", CSSSelectorContainer);
Gtk::Label *CSSSelectorAdd;
@@ -495,9 +498,6 @@ void StyleDialog::_readStyleElement()
const gchar *attr = obj->getRepr()->attribute(iter->name.c_str());
if (attr) {
if (!hasattributes) {
- Gtk::Label *CSSSelector;
- _builder->get_widget("CSSSelector", CSSSelector);
- CSSSelector->set_text("element.attributes");
Gtk::TreeView *CSSTree;
_builder->get_widget("CSSTree", CSSTree);
CSSTree->set_model(store);
@@ -543,14 +543,11 @@ void StyleDialog::_readStyleElement()
}
}
}
- if (contract) {
- CSSSelectorAdd->show();
- CSSSelectorFilled->hide();
- } else {
+ if (!contract) {
CSSSelectorAdd->hide();
CSSSelectorFilled->show();
+ _styleBox.pack_start(*CSSSelectorContainer, Gtk::PACK_EXPAND_WIDGET);
}
- _styleBox.pack_start(*CSSSelectorContainer, Gtk::PACK_EXPAND_WIDGET);
}
if (obj) {
for (unsigned i = 0; i < tokens.size()-1; i += 2) {
@@ -565,7 +562,7 @@ void StyleDialog::_readStyleElement()
}
// Get list of objects selector matches
std::vector<SPObject *> objVec = _getObjVec( selector );
-
+
Glib::ustring properties;
// Check to make sure we do have a value to match selector.
if ((i+1) < tokens.size()) {