comparison base/View.cpp @ 46:5364a9d338a2

* Add Insert Instant function in main window
* Ensure selections and window geometry are saved in session file
* Add wait cursor on session file save
* Various improvements to display of texts in pane (clearer readability)
* Use commands for setting properties on layers and panes
  (still need to batch up multiple sets on the same property)
* Fix failure of spectrogram to refresh when initial part became visible
* Some fixes & paint optimisations in View &c
* Make curve mode for time value layers work properly when resolution == 1
* Some vague improvements for time value layer vertical scale

     m_followZoom = f;
     emit propertyContainerPropertyChanged(m_propertyContainer);
 }
 
 void
-View::drawVisibleText(int x, int y, QString text, TextStyle style)
-{
-    //!!! blah.
+View::drawVisibleText(QPainter &paint, int x, int y, QString text, TextStyle style)
+{
+    if (style == OutlinedText) {
+
+	QColor origPenColour = paint.pen().color();
+	QColor penColour = origPenColour;
+	QColor surroundColour = Qt::white;  //palette().background().color();
+
+	if (!hasLightBackground()) {
+	    int h, s, v;
+	    penColour.getHsv(&h, &s, &v);
+	    penColour = QColor::fromHsv(h, s, 255 - v);
+	    surroundColour = Qt::black;
+	}
+
+	paint.setPen(surroundColour);
+
+	for (int dx = -1; dx <= 1; ++dx) {
+	    for (int dy = -1; dy <= 1; ++dy) {
+		if (!(dx || dy)) continue;
+		paint.drawText(x + dx, y + dy, text);
+	    }
+	}
+
+	paint.setPen(penColour);
+
+	paint.drawText(x, y, text);
+
+	paint.setPen(origPenColour);
+
+    } else {
+
+	std::cerr << "ERROR: View::drawVisibleText: Boxed style not yet implemented!" << std::endl;
+    }
 }
 
 void
 View::setPlaybackFollow(PlaybackFollowMode m)
 {

 View::LayerList
 View::getScrollableBackLayers(bool testChanged, bool &changed) const
 {
     changed = false;
 
+    // We want a list of all the scrollable layers that are behind the
+    // backmost non-scrollable layer.
+
     LayerList scrollables;
     for (LayerList::const_iterator i = m_layers.begin(); i != m_layers.end(); ++i) {
 	if ((*i)->isLayerDormant(this)) continue;
+	if ((*i)->isLayerOpaque()) {
+	    // You can't see anything behind an opaque layer!
+	    scrollables.clear();
+	}
 	if ((*i)->isLayerScrollable(this)) scrollables.push_back(*i);
-	else {
-	    if (testChanged && scrollables != m_lastScrollableBackLayers) {
-		m_lastScrollableBackLayers = scrollables;
-		changed = true;
-	    }
-	    return scrollables;
-	}
-    }
-
-    if (scrollables.size() == 1 &&
-	dynamic_cast<TimeRulerLayer *>(*scrollables.begin())) {
-
-	// If only the ruler is scrollable, it's not worth the bother
-	// -- it probably redraws as quickly as it refreshes from
-	// cache
-	scrollables.clear();
+	else break;
     }
 
     if (testChanged && scrollables != m_lastScrollableBackLayers) {
 	m_lastScrollableBackLayers = scrollables;
 	changed = true;

     LayerList nonScrollables;
 
     // Everything in front of the first non-scrollable from the back
     // should also be considered non-scrollable
 
-    size_t count = 0;
+    bool started = false;
+
     for (LayerList::const_iterator i = m_layers.begin(); i != m_layers.end(); ++i) {
 	if ((*i)->isLayerDormant(this)) continue;
-	if (count < scrollables.size()) {
-	    ++count;
+	if (!started && (*i)->isLayerScrollable(this)) {
 	    continue;
+	}
+	started = true;
+	if ((*i)->isLayerOpaque()) {
+	    // You can't see anything behind an opaque layer!
+	    nonScrollables.clear();
 	}
 	nonScrollables.push_back(*i);
     }
 
     if (testChanged && nonScrollables != m_lastNonScrollableBackLayers) {

     }
 
     QRect nonCacheRect(cacheRect);
 
     // If not all layers are scrollable, but some of the back layers
-    // are, we should store only those in the cache
+    // are, we should store only those in the cache.
 
     bool layersChanged = false;
     LayerList scrollables = getScrollableBackLayers(true, layersChanged);
     LayerList nonScrollables = getNonScrollableFrontLayers(true, layersChanged);
     bool selectionCacheable = nonScrollables.empty();
     bool haveSelections = m_manager && !m_manager->getSelections().empty();
     bool selectionDrawn = false;
 
+    // If all the non-scrollable layers are non-opaque, then we draw
+    // the selection rectangle behind them and cache it.  If any are
+    // opaque, however, we can't cache.
+    //
     if (!selectionCacheable) {
 	selectionCacheable = true;
 	for (LayerList::const_iterator i = nonScrollables.begin();
 	     i != nonScrollables.end(); ++i) {
 	    if ((*i)->isLayerOpaque()) {