blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Fix error selecting the window scale in wayland 

Regression in [0] caused all output to be considered when updating
after monitor outputs changed.

[0]: ac2a56d7f3
This commit is contained in:
Campbell Barton 2022-06-16 13:29:08 +10:00
parent 1fed24de5a
commit 9dd5c2a7ec
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ struct window_t {
* This is an ordered set (whoever adds to this is responsible for keeping members unique).
* In practice this is rarely manipulated and is limited by the number of physical displays.
*/
std::vector<const output_t *> outputs;
std::vector<output_t *> outputs;
/** The scale value written to #wl_surface_set_buffer_scale. */
int scale = 0;
@ -233,7 +233,7 @@ static void surface_handle_enter(void *data,
if (reg_output == nullptr) {
return;
}
std::vector<const output_t *> &outputs = w->outputs();
std::vector<output_t *> &outputs = w->outputs();
auto it = std::find(outputs.begin(), outputs.end(), reg_output);
if (it != outputs.end()) {
return;
@ -252,7 +252,7 @@ static void surface_handle_leave(void *data,
if (reg_output == nullptr) {
return;
}
std::vector<const output_t *> &outputs = w->outputs();
std::vector<output_t *> &outputs = w->outputs();
auto it = std::find(outputs.begin(), outputs.end(), reg_output);
if (it == outputs.end()) {
return;
@ -408,7 +408,7 @@ wl_surface *GHOST_WindowWayland::surface() const
return w->wl_surface;
}
std::vector<const output_t *> &GHOST_WindowWayland::outputs()
std::vector<output_t *> &GHOST_WindowWayland::outputs()
{
return w->outputs;
}
@ -426,7 +426,7 @@ output_t *GHOST_WindowWayland::output_find_by_wl(struct wl_output *output)
bool GHOST_WindowWayland::outputs_changed_update_scale()
{
uint32_t dpi_next;
const int scale_next = outputs_max_scale_or_default(this->m_system->outputs(), 0, &dpi_next);
const int scale_next = outputs_max_scale_or_default(this->outputs(), 0, &dpi_next);
if (scale_next == 0) {
return false;
}

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

@ -103,7 +103,7 @@ class GHOST_WindowWayland : public GHOST_Window {
struct wl_surface *surface() const;
std::vector<const output_t *> &outputs();
std::vector<output_t *> &outputs();
output_t *output_find_by_wl(struct wl_output *output);