Merge remote-tracking branch 'origin/master' into release/1.0

# Conflicts: # examples/example-server-lib/sw_splash.cpp
canonical · Sep 20, 2018 · c849400 · c849400
2 parents 7eade5d + 5ee48a2
commit c849400
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/examples/example-server-lib/sw_splash.cpp b/examples/example-server-lib/sw_splash.cpp
@@ -74,18 +74,8 @@ auto create_window(MirConnection* connection, mir::client::Surface const& surfac
                 mir_output_is_enabled(output))
             {
                 id = mir_output_get_id(output);
-
-                MirOutputMode const* mode = mir_output_get_current_mode(output);
-                width = mir_output_mode_get_width(mode);
-                height = mir_output_mode_get_height(mode);
-
-                switch (mir_output_get_orientation(output))
-                {
-                case mir_orientation_left:
-                case mir_orientation_right:
-                    std::swap(width, height);
-                default:;
-                }
+                width = mir_output_get_logical_width(output);
+                height = mir_output_get_logical_height(output);
             }
         });