summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabiertxof <jabier.arraiza@marker.es>2019-06-24 18:38:37 +0000
committerJabiertxof <jabier.arraiza@marker.es>2019-06-24 18:38:37 +0000
commitcdef7195b54dffdf6bb805e22e117387e35c6341 (patch)
treeddfb1c9c6ba425b244cf9730bf43b05efb987977 /src
parentFixes for scrolling on selectors and style dialogs (diff)
downloadinkscape-cdef7195b54dffdf6bb805e22e117387e35c6341.tar.gz
inkscape-cdef7195b54dffdf6bb805e22e117387e35c6341.zip
Fix coding style
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/selectorsdialog.cpp14
-rw-r--r--src/ui/dialog/styledialog.cpp13
2 files changed, 14 insertions, 13 deletions
diff --git a/src/ui/dialog/selectorsdialog.cpp b/src/ui/dialog/selectorsdialog.cpp
index bae266112..657fc8518 100644
--- a/src/ui/dialog/selectorsdialog.cpp
+++ b/src/ui/dialog/selectorsdialog.cpp
@@ -6,7 +6,7 @@
* Kamalpreet Kaur Grewal
* Tavmjong Bah
* Jabiertxof
- *
+ *
* Copyright (C) Kamalpreet Kaur Grewal 2016 <grewalkamal005@gmail.com>
* Copyright (C) Tavmjong Bah 2017 <tavmjong@free.fr>
*
@@ -156,7 +156,7 @@ void SelectorsDialog::_nodeRemoved(Inkscape::XML::Node &repr)
{
g_debug("SelectorsDialog::NodeRemoved");
-
+
_scroollock = true;
for (auto it = _nodeWatchers.begin(); it != _nodeWatchers.end(); ++it) {
if ( (*it)->_repr == &repr ) {
@@ -174,9 +174,9 @@ void SelectorsDialog::_nodeChanged(Inkscape::XML::Node &object)
{
g_debug("SelectorsDialog::NodeChanged");
-
+
_scroollock = true;
-
+
_readStyleElement();
_selectRow();
}
@@ -293,7 +293,7 @@ void SelectorsDialog::TreeStore::on_row_deleted(const TreeModel::Path &path)
Glib::RefPtr<SelectorsDialog::TreeStore> SelectorsDialog::TreeStore::create(SelectorsDialog *selectorsdialog)
{
g_debug("SelectorsDialog::TreeStore::create");
-
+
SelectorsDialog::TreeStore *store = new SelectorsDialog::TreeStore();
store->_selectorsdialog = selectorsdialog;
store->set_column_types(store->_selectorsdialog->_mColumns);
@@ -673,7 +673,7 @@ void SelectorsDialog::_writeStyleElement()
if (_updating) {
return;
}
-
+
g_debug("SelectorsDialog::_writeStyleElement");
_scroollock = true;
@@ -1238,7 +1238,7 @@ void SelectorsDialog::_addSelector()
}
// Add entry to style element
_writeStyleElement();
- _scroollock = false;
+ _scroollock = false;
_vadj->set_value(std::min(_scroolpos, _vadj->get_upper()));
}
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index 1427b4964..4af56346d 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -166,9 +166,10 @@ void StyleDialog::_nodeRemoved(Inkscape::XML::Node &repr)
_readStyleElement();
}
-void StyleDialog::_nodeChanged(Inkscape::XML::Node &object) {
+void StyleDialog::_nodeChanged(Inkscape::XML::Node &object)
+{
g_debug("StyleDialog::_nodeChanged");
- _readStyleElement();
+ _readStyleElement();
}
/* void
@@ -961,7 +962,7 @@ bool StyleDialog::_addRow(GdkEventButton *evt, Glib::RefPtr<Gtk::TreeStore> stor
Glib::ustring selector, gint pos)
{
g_debug("StyleDialog::_addRow");
-
+
if (evt->type == GDK_BUTTON_RELEASE && evt->button == 1) {
Gtk::TreeIter iter = store->append();
Gtk::TreeModel::Path path = (Gtk::TreeModel::Path)iter;
@@ -1097,7 +1098,7 @@ StyleDialog::_startValueEdit(Gtk::CellEditable* cell, const Glib::ustring& path,
void StyleDialog::_startNameEdit(Gtk::CellEditable *cell, const Glib::ustring &path)
{
g_debug("StyleDialog::_startNameEdit");
-
+
_scroollock = true;
Glib::RefPtr<Gtk::ListStore> completionModel = Gtk::ListStore::create(_mCSSData);
Glib::RefPtr<Gtk::EntryCompletion> entry_completion = Gtk::EntryCompletion::create();
@@ -1171,7 +1172,7 @@ void StyleDialog::_valueEdited(const Glib::ustring &path, const Glib::ustring &v
Glib::RefPtr<Gtk::TreeStore> store)
{
g_debug("StyleDialog::_valueEdited");
-
+
_scroollock = true;
Gtk::TreeModel::Row row = *store->get_iter(path);
@@ -1194,7 +1195,7 @@ void StyleDialog::_valueEdited(const Glib::ustring &path, const Glib::ustring &v
void StyleDialog::_activeToggled(const Glib::ustring &path, Glib::RefPtr<Gtk::TreeStore> store)
{
g_debug("StyleDialog::_activeToggled");
-
+
_scroollock = true;
Gtk::TreeModel::Row row = *store->get_iter(path);
if (row) {