Skip to content
Snippets Groups Projects
Commit 04ad0505 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Fix font shadow problem

parent d9a6d7ec
No related branches found
No related tags found
1 merge request!316Resolves #343 GUI and Frame Refactor
This commit is part of merge request !316. Comments created here will be created in the context of that merge request.
...@@ -84,6 +84,7 @@ void StatisticsWidget::draw(NVGcontext *ctx) { ...@@ -84,6 +84,7 @@ void StatisticsWidget::draw(NVGcontext *ctx) {
else nvgFontFace(ctx, "sans-bold"); else nvgFontFace(ctx, "sans-bold");
nvgFillColor(ctx, nanogui::Color(8, 8, 8, 255)); // shadow nvgFillColor(ctx, nanogui::Color(8, 8, 8, 255)); // shadow
tw = nvgTextBounds(ctx, pos[0] + width(), rowh, msg.c_str(), nullptr, nullptr); tw = nvgTextBounds(ctx, pos[0] + width(), rowh, msg.c_str(), nullptr, nullptr);
nvgText(ctx, pos[0] + width(), rowh, msg.c_str(), nullptr);
nvgFillColor(ctx, colour); nvgFillColor(ctx, colour);
nvgText(ctx, pos[0] + width() - 1, rowh - 1, msg.c_str(), nullptr); nvgText(ctx, pos[0] + width() - 1, rowh - 1, msg.c_str(), nullptr);
tw += 10; tw += 10;
......
...@@ -316,11 +316,13 @@ void ForeignBuilder::_schedule() { ...@@ -316,11 +316,13 @@ void ForeignBuilder::_schedule() {
jobs_++; jobs_++;
ftl::pool.push([this,fs](int) { ftl::pool.push([this,fs](int) {
// Calling onFrameset but without all frames so mark as partial
if (static_cast<size_t>(fs->count) < fs->frames.size()) fs->set(ftl::data::FSFlag::PARTIAL);
fs->store(); fs->store();
if (!fs->isComplete()) {
fs->set(ftl::data::FSFlag::PARTIAL);
fs->frames[0].message(ftl::data::Message::Warning_INCOMPLETE_FRAME, "Frameset not complete");
}
//UNIQUE_LOCK(fs->mutex(), lk2); //UNIQUE_LOCK(fs->mutex(), lk2);
try { try {
...@@ -373,7 +375,7 @@ std::shared_ptr<ftl::data::FrameSet> ForeignBuilder::_getFrameset() { ...@@ -373,7 +375,7 @@ std::shared_ptr<ftl::data::FrameSet> ForeignBuilder::_getFrameset() {
while (N-- > 0 && i != framesets_.end()) ++i; while (N-- > 0 && i != framesets_.end()) ++i;
// Otherwise skip to first fully completed frame // Otherwise skip to first fully completed frame
} else { } else {
while (i != framesets_.end() && static_cast<size_t>((*i)->count) < (*i)->frames.size()) ++i; while (i != framesets_.end() && !(*i)->isComplete()) ++i;
} }
if (i != framesets_.end()) { if (i != framesets_.end()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment