if (nullptr != new_area) {
json_object_object_add(json_in, "area", json_object_new_string(new_area));
}
- rm::g_new_role = std::string(new_role); // TODO: workaround
+
+ // TODO: workaround
+ if (nullptr != new_role) {
+ rm::g_new_role = std::string(new_role);
+ }
+ else {
+ rm::g_new_role = std::string("");
+ }
+
this->pm_.inputEvent(json_in);
// Release json_object
for (unsigned i = 0, iend = this->pending_end_draw.size(); i < iend; i++) {
auto n = this->lookup_name(this->pending_end_draw[i]);
+ int surface_id = this->pending_end_draw[i];
+
if (n && *n == role) {
std::swap(this->pending_end_draw[i], this->pending_end_draw[iend - 1]);
this->pending_end_draw.resize(iend - 1);
- this->activate(this->pending_end_draw[i]);
+ this->activate(surface_id);
this->emit_flushdraw(drawing_name);
this->emitScreenUpdated(appid);
}
HMI_DEBUG("wm", "Surface rect { %d, %d, %d, %d }",
size.x, size.y, size.w, size.h);
+ // Enqueue flushDraw event
+ this->enqueue_flushdraw(surface_id);
+
// Emit syncDraw event
const char* drawing_name = this->role2drawingname_[role].c_str();
this->emit_syncdraw(drawing_name, area,
size.x, size.y, size.w, size.h);
-
- // Enqueue flushDraw event
- this->enqueue_flushdraw(surface_id);
}
void App::setAccelPedalPos(double val) {