1
=== modified file 'debian/changelog'
2
--- debian/changelog	2017-09-19 11:07:20 +0000
3
+++ debian/changelog	2017-09-24 08:34:52 +0000
4
@@ -51,6 +51,8 @@
5
51
        actual values to avoid ldiv0. (LP: #1717061)
51
        actual values to avoid ldiv0. (LP: #1717061)
6
52
      . [miral-kiosk] Apply fullscreen logic when hidden windows are restored.
52
      . [miral-kiosk] Apply fullscreen logic when hidden windows are restored.
7
53
        (LP: #1717910)
53
        (LP: #1717910)
8
54
      . [mir-on-x11] Less annoying clipping of Mir-on-X11 window when it exceeds
9
55
        display bounds. (LP: #1668599)
10
54
56
11
55
 -- Alan Griffiths <alan.griffiths@canonical.com>  Thu, 10 Aug 2017 11:54:30 +0000
57
 -- Alan Griffiths <alan.griffiths@canonical.com>  Thu, 10 Aug 2017 11:54:30 +0000
12
56
58
13
57
59
14
=== modified file 'src/platforms/mesa/server/x11/graphics/display.cpp'
15
--- src/platforms/mesa/server/x11/graphics/display.cpp	2017-07-28 17:00:43 +0000
16
+++ src/platforms/mesa/server/x11/graphics/display.cpp	2017-09-24 08:34:52 +0000
17
@@ -31,6 +31,7 @@
18
31
#include <boost/throw_exception.hpp>
31
#include <boost/throw_exception.hpp>
19
32
32
20
33
#include <X11/Xatom.h>
33
#include <X11/Xatom.h>
21
34
#include <algorithm>
22
34
35
23
35
#define MIR_LOG_COMPONENT "x11-display"
36
#define MIR_LOG_COMPONENT "x11-display"
24
36
#include "mir/log.h"
37
#include "mir/log.h"
25
@@ -53,16 +54,19 @@
26
53
54
27
54
    mir::log_info("Screen resolution = %dx%d", screen_width, screen_height);
55
    mir::log_info("Screen resolution = %dx%d", screen_width, screen_height);
28
55
56
31
56
    if ((screen_width < requested_size.width.as_uint32_t()+border) ||
57
    auto const width  = std::min(requested_size.width,  geom::Width{screen_width-border});
32
57
        (screen_height < requested_size.height.as_uint32_t()+border))
58
    auto const height = std::min(requested_size.height, geom::Height{screen_height-border});
33
59
34
60
    geom::Size const result{width, height};
35
61
36
62
    if (result != requested_size)
37
58
    {
63
    {
38
59
        mir::log_info(" ... is smaller than the requested size (%dx%d) plus border (%d). Clipping to (%dx%d).",
64
        mir::log_info(" ... is smaller than the requested size (%dx%d) plus border (%d). Clipping to (%dx%d).",
42
60
            requested_size.width.as_uint32_t(), requested_size.height.as_uint32_t(), border,
65
                      requested_size.width.as_uint32_t(), requested_size.height.as_uint32_t(), border,
43
61
            screen_width-border, screen_height-border);
66
                      width.as_uint32_t(), height.as_uint32_t());
41
62
        return geom::Size{screen_width-border, screen_height-border};
44
63
    }
67
    }
45
64
68
47
65
    return requested_size;
69
    return result;
48
66
}
70
}
49
67
71
50
68
auto get_pixel_width(Display *dpy)
72
auto get_pixel_width(Display *dpy)
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2017-09-25
Gerry Boland (community)		2017-09-24	Approve on 2017-09-25
Review via email: mp+331249@code.launchpad.net