diff options
author | 2017-09-12 11:29:36 +0200 | |
---|---|---|
committer | 2017-09-12 11:29:36 +0200 | |
commit | 9a5202f6d3642ea08e1b72340dd4eebad835e082 (patch) | |
tree | fb0c7b50dd77758d52b8a8242d07295a258feeee /src/app.cpp | |
parent | 3658e3b06e8b53ad449ba5d2cef736dfd7472991 (diff) |
App: do some clang-format
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src/app.cpp')
-rw-r--r-- | src/app.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/app.cpp b/src/app.cpp index da149b9..9292585 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -53,8 +53,7 @@ result<json> file_to_json(char const *filename) { return Ok(j); } -struct result<layer_map> - load_layer_map(char const *filename) { +struct result<layer_map> load_layer_map(char const *filename) { logdebug("loading IDs from %s", filename); auto j = file_to_json(filename); @@ -210,8 +209,9 @@ int App::init_layers() { auto &l = layers[i.layer_id]; l->set_destination_rectangle(0, 0, o->width, o->height); l->set_visibility(1); - logdebug("Setting up layer %s (%d) for surfaces %d-%d and role match \"%s\"", i.name.c_str(), - i.layer_id, i.id_min, i.id_max, i.role.c_str()); + logdebug( + "Setting up layer %s (%d) for surfaces %d-%d and role match \"%s\"", + i.name.c_str(), i.layer_id, i.id_min, i.id_max, i.role.c_str()); this->layouts[l->id] = LayoutState{}; } @@ -299,13 +299,14 @@ void App::surface_set_layout_full(uint32_t surface_id) { // set destination to the display rectangle s->set_destination_rectangle(x, y, w, h); - //redraw_fix(this, s, x, y, w, h); + // redraw_fix(this, s, x, y, w, h); - logdebug("Surface %u now with rect { %d, %d, %d, %d }", - surface_id, x, y, w, h); + logdebug("Surface %u now with rect { %d, %d, %d, %d }", surface_id, x, y, w, + h); } -void App::surface_set_layout_split(uint32_t surface_id, uint32_t sub_surface_id) { +void App::surface_set_layout_split(uint32_t surface_id, + uint32_t sub_surface_id) { if (!this->controller->surface_exists(surface_id)) { logerror("Surface %d does not exist", int(surface_id)); return; @@ -388,13 +389,13 @@ char const *App::api_activate_surface(char const *drawing_name) { auto layer_id = this->layers.get_layer_id(*surface_id); - if (! layer_id) { + if (!layer_id) { return "Surface is not on any layer!"; } auto o_state = *this->layers.get_layout_state(*surface_id); - if (! o_state) { + if (!o_state) { return "Could not find layer for surface"; } @@ -505,7 +506,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { auto o_state = *this->layers.get_layout_state(*surface_id); - if (! o_state) { + if (!o_state) { return "Could not find layer for surface"; } @@ -537,7 +538,7 @@ char const *App::api_deactivate_surface(char const *drawing_name) { this->deactivate(*surface_id); state.main = -1; } - }else if (state.sub == *surface_id) { + } else if (state.sub == *surface_id) { std::string main = std::move(*this->lookup_name(state.main)); this->emit_syncdraw(main.c_str()); @@ -581,15 +582,16 @@ char const *App::api_enddraw(char const *drawing_name) { // |_| void App::surface_created(uint32_t surface_id) { auto layer_id = this->layers.get_layer_id(surface_id); - if (! layer_id) { - logdebug("Newly created surfce %d is not associated with any layer!", surface_id); + if (!layer_id) { + logdebug("Newly created surfce %d is not associated with any layer!", + surface_id); return; } logdebug("surface_id is %u, layer_id is %u", surface_id, *layer_id); - this->controller->layers[*layer_id] - ->add_surface(this->controller->surfaces[surface_id].get()); + this->controller->layers[*layer_id]->add_surface( + this->controller->surfaces[surface_id].get()); // activate the main_surface right away if (surface_id == static_cast<unsigned>(this->layers.main_surface)) { @@ -688,8 +690,7 @@ void App::deactivate(int id) { bool App::can_split(struct LayoutState const &state, int new_id) { if (state.main != -1 && state.main != new_id) { auto new_id_layer = this->layers.get_layer_id(new_id).value(); - auto current_id_layer = - this->layers.get_layer_id(state.main).value(); + auto current_id_layer = this->layers.get_layer_id(state.main).value(); // surfaces are on separate layers, don't bother. if (new_id_layer != current_id_layer) { @@ -697,8 +698,7 @@ bool App::can_split(struct LayoutState const &state, int new_id) { } std::string const &new_id_str = this->lookup_name(new_id).value(); - std::string const &cur_id_str = - this->lookup_name(state.main).value(); + std::string const &cur_id_str = this->lookup_name(state.main).value(); auto const &layer = this->layers.get_layer(new_id_layer); |