Merge pull request #3169 from MirServer/fix-changing-scale

mg::MultiplexingDisplay: Copy *all* mutable fields on user configuration update
canonical · Dec 15, 2023 · f5f662b · f5f662b
2 parents 5720b06 + f143984
commit f5f662b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/server/graphics/multiplexing_display.cpp b/src/server/graphics/multiplexing_display.cpp
@@ -83,8 +83,12 @@ class CompositeDisplayConfiguration : public mg::DisplayConfiguration
                     output.current_format = mutable_output.current_format;
                     output.power_mode = mutable_output.power_mode;
                     output.orientation = mutable_output.orientation;
+                    output.scale = mutable_output.scale;
+                    output.form_factor = mutable_output.form_factor;
+                    // MirSubpixelArrangement is mistakenly non-const?
                     output.gamma = mutable_output.gamma;
                     output.custom_logical_size = mutable_output.custom_logical_size;
+                    output.custom_attribute = std::move(mutable_output.custom_attribute);
                 });
         }
     }