comparison base/View.cpp @ 85:ea730e3f9ace

* Ensure consistent ordering of layer text labels
* Fix erroneous SR mismatch warning when adding a wave-file model when
  no other wave-file model is present (only models that don't assert any
  particular playback samplerate)

 }
 
 int
 View::getTextLabelHeight(const Layer *layer, QPainter &paint) const
 {
-    int y = 15 + paint.fontMetrics().ascent();
+    std::map<int, Layer *> sortedLayers;
 
     for (LayerList::const_iterator i = m_layers.begin();
          i != m_layers.end(); ++i) { 
-
-        if (*i == layer) return y;
-
         if ((*i)->needsTextLabelHeight()) {
-            y += paint.fontMetrics().height();
+            sortedLayers[getObjectExportId(*i)] = *i;
         }
+    }
+
+    int y = 15 + paint.fontMetrics().ascent();
+
+    for (std::map<int, Layer *>::const_iterator i = sortedLayers.begin();
+         i != sortedLayers.end(); ++i) {
+        if (i->second == layer) return y;
+        y += paint.fontMetrics().height();
     }
 
     return y;
 }