diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-21 21:07:01 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-05-21 21:07:01 +0000 |
| commit | 0c4ff843cb6263af471cd0b95ebb3a930b8a000e (patch) | |
| tree | 36559957dab0432bf071f45a0449ccb70167a2cc /src/ui/dialog/swatches.cpp | |
| parent | Update to refresh knots (diff) | |
| parent | Remove duplicated code (diff) | |
| download | inkscape-0c4ff843cb6263af471cd0b95ebb3a930b8a000e.tar.gz inkscape-0c4ff843cb6263af471cd0b95ebb3a930b8a000e.zip | |
update to trunk
(bzr r13645.1.140)
Diffstat (limited to 'src/ui/dialog/swatches.cpp')
| -rw-r--r-- | src/ui/dialog/swatches.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index 924ebe03d..6577c8d4e 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -171,8 +171,8 @@ static void editGradient( GtkMenuItem */*menuitem*/, gpointer /*user_data*/ ) SPDocument *doc = desktop ? desktop->doc() : 0; if (doc) { std::string targetName(bounceTarget->def.descr); - std::set<SPObject *> gradients = doc->getResourceList("gradient"); - for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { + std::vector<SPObject *> gradients = doc->getResourceList("gradient"); + for (std::vector<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { SPGradient* grad = SP_GRADIENT(*item); if ( targetName == grad->getId() ) { editGradientImpl( desktop, grad ); @@ -192,8 +192,8 @@ void SwatchesPanelHook::convertGradient( GtkMenuItem * /*menuitem*/, gpointer us gint index = GPOINTER_TO_INT(userData); if ( doc && (index >= 0) && (static_cast<guint>(index) < popupItems.size()) ) { Glib::ustring targetName = popupItems[index]; - std::set<SPObject *> gradients = doc->getResourceList("gradient"); - for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { + std::vector<SPObject *> gradients = doc->getResourceList("gradient"); + for (std::vector<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { SPGradient* grad = SP_GRADIENT(*item); if ( targetName == grad->getId() ) { @@ -326,9 +326,9 @@ gboolean colorItemHandleButtonPress( GtkWidget* widget, GdkEventButton* event, g SPDesktopWidget *dtw = SP_DESKTOP_WIDGET(wdgt); if ( dtw && dtw->desktop ) { // Pick up all gradients with vectors - std::set<SPObject *> gradients = (dtw->desktop->doc())->getResourceList("gradient"); + std::vector<SPObject *> gradients = (dtw->desktop->doc())->getResourceList("gradient"); gint index = 0; - for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { + for (std::vector<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { SPGradient* grad = SP_GRADIENT(*item); if ( grad->hasStops() && !grad->isSwatch() ) { //gl = g_slist_prepend(gl, curr->data); @@ -594,6 +594,7 @@ SwatchesPanel::SwatchesPanel(gchar const* prefsPath) : _currentDesktop(0), _currentDocument(0) { + set_name( "SwatchesPanel" ); Gtk::RadioMenuItem* hotItem = 0; _holder = new PreviewHolder(); _clear = new ColorItem( ege::PaintDef::CLEAR ); @@ -924,8 +925,8 @@ static void recalcSwatchContents(SPDocument* doc, std::map<ColorItem*, SPGradient*> &gradMappings) { std::vector<SPGradient*> newList; - std::set<SPObject *> gradients = doc->getResourceList("gradient"); - for (std::set<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { + std::vector<SPObject *> gradients = doc->getResourceList("gradient"); + for (std::vector<SPObject *>::const_iterator item = gradients.begin(); item != gradients.end(); ++item) { SPGradient* grad = SP_GRADIENT(*item); if ( grad->isSwatch() ) { newList.push_back(SP_GRADIENT(*item)); |