[core] rename onPlacementRedone -> onNeedsRepaint

This commit is contained in:
Konstantin Käfer
2016-05-27 16:54:31 +02:00
parent 2c7f7fb566
commit 8a8f828e41
10 changed files with 21 additions and 21 deletions

View File

@@ -37,7 +37,7 @@ class Map::Impl : public style::Observer {
public:
Impl(View&, FileSource&, MapMode, GLContextMode, ConstrainMode, ViewportMode);
void onResourceLoaded() override;
void onNeedsRepaint() override;
void onResourceError(std::exception_ptr) override;
void update();
@@ -836,7 +836,7 @@ void Map::onLowMemory() {
impl->view.invalidate();
}
void Map::Impl::onResourceLoaded() {
void Map::Impl::onNeedsRepaint() {
updateFlags |= Update::Repaint;
asyncUpdate.send();
}

View File

@@ -15,10 +15,10 @@ public:
* In addition to the individual glyph, sprite, and source events, the
* following "rollup" events are provided for convenience. They are
* strictly additive; e.g. when a source is loaded, both `onSourceLoaded`
* and `onResourceLoaded` will be called.
* and `onNeedsRepaint` will be called.
*/
virtual void onResourceLoaded() {};
virtual void onResourceError(std::exception_ptr) {};
virtual void onNeedsRepaint() {}
virtual void onResourceError(std::exception_ptr) {}
};
} // namespace style

View File

@@ -418,8 +418,8 @@ void Source::onTileError(TileData& tileData, std::exception_ptr error) {
observer->onTileError(*this, tileData.id, error);
}
void Source::onPlacementRedone(TileData&) {
observer->onPlacementRedone();
void Source::onNeedsRepaint() {
observer->onNeedsRepaint();
}
void Source::dumpDebugLogs() const {

View File

@@ -92,7 +92,7 @@ private:
// TileDataObserver implementation.
void onTileLoaded(TileData&, bool isNewTile) override;
void onTileError(TileData&, std::exception_ptr) override;
void onPlacementRedone(TileData&) override;
void onNeedsRepaint() override;
std::unique_ptr<TileData> createTile(const OverscaledTileID&, const UpdateParameters&);

View File

@@ -18,7 +18,7 @@ public:
virtual void onSourceError(Source&, std::exception_ptr) {}
virtual void onTileLoaded(Source&, const OverscaledTileID&, bool /* isNewTile */) {}
virtual void onTileError(Source&, const OverscaledTileID&, std::exception_ptr) {}
virtual void onPlacementRedone() {}
virtual void onNeedsRepaint() {}
};
} // namespace style

View File

@@ -373,7 +373,7 @@ void Style::setObserver(style::Observer* observer_) {
void Style::onGlyphsLoaded(const FontStack& fontStack, const GlyphRange& glyphRange) {
shouldReparsePartialTiles = true;
observer->onGlyphsLoaded(fontStack, glyphRange);
observer->onResourceLoaded();
observer->onNeedsRepaint();
}
void Style::onGlyphsError(const FontStack& fontStack, const GlyphRange& glyphRange, std::exception_ptr error) {
@@ -386,7 +386,7 @@ void Style::onGlyphsError(const FontStack& fontStack, const GlyphRange& glyphRan
void Style::onSourceLoaded(Source& source) {
observer->onSourceLoaded(source);
observer->onResourceLoaded();
observer->onNeedsRepaint();
}
void Style::onSourceError(Source& source, std::exception_ptr error) {
@@ -403,7 +403,7 @@ void Style::onTileLoaded(Source& source, const OverscaledTileID& tileID, bool is
}
observer->onTileLoaded(source, tileID, isNewTile);
observer->onResourceLoaded();
observer->onNeedsRepaint();
}
void Style::onTileError(Source& source, const OverscaledTileID& tileID, std::exception_ptr error) {
@@ -414,14 +414,14 @@ void Style::onTileError(Source& source, const OverscaledTileID& tileID, std::exc
observer->onResourceError(error);
}
void Style::onPlacementRedone() {
observer->onResourceLoaded();
void Style::onNeedsRepaint() {
observer->onNeedsRepaint();
}
void Style::onSpriteLoaded() {
shouldReparsePartialTiles = true;
observer->onSpriteLoaded();
observer->onResourceLoaded();
observer->onNeedsRepaint();
}
void Style::onSpriteError(std::exception_ptr error) {

View File

@@ -112,7 +112,7 @@ private:
void onSourceError(Source&, std::exception_ptr) override;
void onTileLoaded(Source&, const OverscaledTileID&, bool isNewTile) override;
void onTileError(Source&, const OverscaledTileID&, std::exception_ptr) override;
void onPlacementRedone() override;
void onNeedsRepaint() override;
Observer nullObserver;
Observer* observer = &nullObserver;

View File

@@ -174,7 +174,7 @@ void GeometryTileData::redoPlacement() {
if (placedConfig != targetConfig) {
redoPlacement();
} else {
observer->onPlacementRedone(*this);
observer->onNeedsRepaint();
}
});
}

View File

@@ -12,7 +12,7 @@ public:
virtual void onTileLoaded(TileData&, bool /*isNewTile*/) {}
virtual void onTileError(TileData&, std::exception_ptr) {}
virtual void onPlacementRedone(TileData&) {}
virtual void onNeedsRepaint() {}
};
} // namespace mbgl

View File

@@ -43,8 +43,8 @@ public:
if (tileError) tileError(source, tileID, error);
}
void onResourceLoaded() override {
if (resourceLoaded) resourceLoaded();
void onNeedsRepaint() override {
if (needsRepaint) needsRepaint();
};
void onResourceError(std::exception_ptr error) override {
@@ -59,6 +59,6 @@ public:
std::function<void (Source&, std::exception_ptr)> sourceError;
std::function<void (Source&, const OverscaledTileID&, bool isNewTile)> tileLoaded;
std::function<void (Source&, const OverscaledTileID&, std::exception_ptr)> tileError;
std::function<void ()> resourceLoaded;
std::function<void ()> needsRepaint;
std::function<void (std::exception_ptr)> resourceError;
};