blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Cleanup: return const vector for system & window outputs() method 

Move the enter/leave logic into methods so the method can return a const
vector which isn't to be manipulated from other functions.
This commit is contained in:
Campbell Barton 2022-06-16 14:20:34 +10:00
parent 9dd5c2a7ec
commit 0d644e6d06
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
intern/ghost/intern/GHOST_WindowWayland.cpp
View File

@ -233,14 +233,10 @@ static void surface_handle_enter(void *data,
if (reg_output == nullptr) {
return;
}
std::vector<output_t *> &outputs = w->outputs();
auto it = std::find(outputs.begin(), outputs.end(), reg_output);
if (it != outputs.end()) {
return;
}
outputs.push_back(reg_output);
w->outputs_changed_update_scale();
if (w->outputs_enter(reg_output)) {
w->outputs_changed_update_scale();
}
}
static void surface_handle_leave(void *data,
@ -252,14 +248,10 @@ static void surface_handle_leave(void *data,
if (reg_output == nullptr) {
return;
}
std::vector<output_t *> &outputs = w->outputs();
auto it = std::find(outputs.begin(), outputs.end(), reg_output);
if (it == outputs.end()) {
return;
}
outputs.erase(it);
w->outputs_changed_update_scale();
if (w->outputs_leave(reg_output)) {
w->outputs_changed_update_scale();
}
}
struct wl_surface_listener wl_surface_listener = {
@ -408,7 +400,7 @@ wl_surface *GHOST_WindowWayland::surface() const
return w->wl_surface;
}
std::vector<output_t *> &GHOST_WindowWayland::outputs()
const std::vector<output_t *> &GHOST_WindowWayland::outputs()
{
return w->outputs;
}
@ -456,6 +448,28 @@ bool GHOST_WindowWayland::outputs_changed_update_scale()
return changed;
}
bool GHOST_WindowWayland::outputs_enter(output_t *reg_output)
{
std::vector<output_t *> &outputs = w->outputs;
auto it = std::find(outputs.begin(), outputs.end(), reg_output);
if (it != outputs.end()) {
return false;
}
outputs.push_back(reg_output);
return true;
}
bool GHOST_WindowWayland::outputs_leave(output_t *reg_output)
{
std::vector<output_t *> &outputs = w->outputs;
auto it = std::find(outputs.begin(), outputs.end(), reg_output);
if (it == outputs.end()) {
return false;
}
outputs.erase(it);
return true;
}
uint16_t GHOST_WindowWayland::dpi()
{
return w->dpi;

6
intern/ghost/intern/GHOST_WindowWayland.h
View File

@ -103,10 +103,12 @@ class GHOST_WindowWayland : public GHOST_Window {
struct wl_surface *surface() const;
std::vector<output_t *> &outputs();
output_t *output_find_by_wl(struct wl_output *output);
const std::vector<output_t *> &outputs();
bool outputs_enter(output_t *reg_output);
bool outputs_leave(output_t *reg_output);
bool outputs_changed_update_scale();
uint16_t dpi();